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

Updated -m 32800 to latest hashcat base

Browse Source 
Fixed -m 32800 false negative in -a 3 multihash cracking in optimized mode
This commit is contained in:
Jens Steube 2025-07-15 09:35:37 +02:00
parent 29691c31d8
commit ef0c23f2fb
7 changed files with 57 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OpenCL/m32800_a0-optimized.cl
View File

@ -34,7 +34,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 m32800_m04 (KERN_ATTR_RULES ())
KERNEL_FQ KERNEL_FA void m32800_m04 (KERN_ATTR_RULES ())
{
/**
* modifier
@ -436,15 +436,15 @@ KERNEL_FQ void m32800_m04 (KERN_ATTR_RULES ())
}
}
KERNEL_FQ void m32800_m08 (KERN_ATTR_RULES ())
KERNEL_FQ KERNEL_FA void m32800_m08 (KERN_ATTR_RULES ())
{
}
KERNEL_FQ void m32800_m16 (KERN_ATTR_RULES ())
KERNEL_FQ KERNEL_FA void m32800_m16 (KERN_ATTR_RULES ())
{
}
KERNEL_FQ void m32800_s04 (KERN_ATTR_RULES ())
KERNEL_FQ KERNEL_FA void m32800_s04 (KERN_ATTR_RULES ())
{
/**
* modifier
@ -861,10 +861,10 @@ KERNEL_FQ void m32800_s04 (KERN_ATTR_RULES ())
}
}
KERNEL_FQ void m32800_s08 (KERN_ATTR_RULES ())
KERNEL_FQ KERNEL_FA void m32800_s08 (KERN_ATTR_RULES ())
{
}
KERNEL_FQ void m32800_s16 (KERN_ATTR_RULES ())
KERNEL_FQ KERNEL_FA void m32800_s16 (KERN_ATTR_RULES ())
{
}

4
OpenCL/m32800_a0-pure.cl
View File

@ -34,7 +34,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 m32800_mxx (KERN_ATTR_RULES ())
KERNEL_FQ KERNEL_FA void m32800_mxx (KERN_ATTR_RULES ())
{
/**
* modifier
@ -164,7 +164,7 @@ KERNEL_FQ void m32800_mxx (KERN_ATTR_RULES ())
}
}
KERNEL_FQ void m32800_sxx (KERN_ATTR_RULES ())
KERNEL_FQ KERNEL_FA void m32800_sxx (KERN_ATTR_RULES ())
{
/**
* modifier

12
OpenCL/m32800_a1-optimized.cl
View File

@ -32,7 +32,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 m32800_m04 (KERN_ATTR_BASIC ())
KERNEL_FQ KERNEL_FA void m32800_m04 (KERN_ATTR_BASIC ())
{
/**
* modifier
@ -489,15 +489,15 @@ KERNEL_FQ void m32800_m04 (KERN_ATTR_BASIC ())
}
}
KERNEL_FQ void m32800_m08 (KERN_ATTR_BASIC ())
KERNEL_FQ KERNEL_FA void m32800_m08 (KERN_ATTR_BASIC ())
{
}
KERNEL_FQ void m32800_m16 (KERN_ATTR_BASIC ())
KERNEL_FQ KERNEL_FA void m32800_m16 (KERN_ATTR_BASIC ())
{
}
KERNEL_FQ void m32800_s04 (KERN_ATTR_BASIC ())
KERNEL_FQ KERNEL_FA void m32800_s04 (KERN_ATTR_BASIC ())
{
/**
* modifier
@ -969,10 +969,10 @@ KERNEL_FQ void m32800_s04 (KERN_ATTR_BASIC ())
}
}
KERNEL_FQ void m32800_s08 (KERN_ATTR_BASIC ())
KERNEL_FQ KERNEL_FA void m32800_s08 (KERN_ATTR_BASIC ())
{
}
KERNEL_FQ void m32800_s16 (KERN_ATTR_BASIC ())
KERNEL_FQ KERNEL_FA void m32800_s16 (KERN_ATTR_BASIC ())
{
}

4
OpenCL/m32800_a1-pure.cl
View File

@ -32,7 +32,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 m32800_mxx (KERN_ATTR_BASIC ())
KERNEL_FQ KERNEL_FA void m32800_mxx (KERN_ATTR_BASIC ())
{
/**
* modifier
@ -160,7 +160,7 @@ md5_ctx_t ctx0 = ctx;
}
}
KERNEL_FQ void m32800_sxx (KERN_ATTR_BASIC ())
KERNEL_FQ KERNEL_FA void m32800_sxx (KERN_ATTR_BASIC ())
{
/**
* modifier

16
OpenCL/m32800_a3-optimized.cl
View File

@ -783,7 +783,7 @@ DECLSPEC void m32800s (PRIVATE_AS u32 *w0, PRIVATE_AS u32 *w1, PRIVATE_AS u32 *w
}
}
KERNEL_FQ void m32800_m04 (KERN_ATTR_BASIC ())
KERNEL_FQ KERNEL_FA void m32800_m04 (KERN_ATTR_BASIC ())
{
/**
* base
@ -844,8 +844,8 @@ KERNEL_FQ void m32800_m04 (KERN_ATTR_BASIC ())
w3[0] = 0;
w3[1] = 0;
w3[2] = 0;
w3[3] = pws[gid].i[15];
w3[2] = pws[gid].i[14];
w3[3] = 0;
const u32 pw_len = pws[gid].pw_len & 63;
@ -856,7 +856,7 @@ KERNEL_FQ void m32800_m04 (KERN_ATTR_BASIC ())
m32800m (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, kernel_param, gid, lid, lsz, l_bin2asc, b_bin2asc);
}
KERNEL_FQ void m32800_m08 (KERN_ATTR_BASIC ())
KERNEL_FQ KERNEL_FA void m32800_m08 (KERN_ATTR_BASIC ())
{
/**
* base
@ -929,7 +929,7 @@ KERNEL_FQ void m32800_m08 (KERN_ATTR_BASIC ())
m32800m (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, kernel_param, gid, lid, lsz, l_bin2asc, b_bin2asc);
}
KERNEL_FQ void m32800_m16 (KERN_ATTR_BASIC ())
KERNEL_FQ KERNEL_FA void m32800_m16 (KERN_ATTR_BASIC ())
{
/**
* base
@ -1002,7 +1002,7 @@ KERNEL_FQ void m32800_m16 (KERN_ATTR_BASIC ())
m32800m (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, kernel_param, gid, lid, lsz, l_bin2asc, b_bin2asc);
}
KERNEL_FQ void m32800_s04 (KERN_ATTR_BASIC ())
KERNEL_FQ KERNEL_FA void m32800_s04 (KERN_ATTR_BASIC ())
{
/**
* base
@ -1075,7 +1075,7 @@ KERNEL_FQ void m32800_s04 (KERN_ATTR_BASIC ())
m32800s (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, kernel_param, gid, lid, lsz, l_bin2asc, b_bin2asc);
}
KERNEL_FQ void m32800_s08 (KERN_ATTR_BASIC ())
KERNEL_FQ KERNEL_FA void m32800_s08 (KERN_ATTR_BASIC ())
{
/**
* base
@ -1148,7 +1148,7 @@ KERNEL_FQ void m32800_s08 (KERN_ATTR_BASIC ())
m32800s (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, kernel_param, gid, lid, lsz, l_bin2asc, b_bin2asc);
}
KERNEL_FQ void m32800_s16 (KERN_ATTR_BASIC ())
KERNEL_FQ KERNEL_FA void m32800_s16 (KERN_ATTR_BASIC ())
{
/**
* base

4
OpenCL/m32800_a3-pure.cl
View File

@ -32,7 +32,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 m32800_mxx (KERN_ATTR_VECTOR ())
KERNEL_FQ KERNEL_FA void m32800_mxx (KERN_ATTR_VECTOR ())
{
/**
* modifier
@ -173,7 +173,7 @@ KERNEL_FQ void m32800_mxx (KERN_ATTR_VECTOR ())
}
}
KERNEL_FQ void m32800_sxx (KERN_ATTR_VECTOR ())
KERNEL_FQ KERNEL_FA void m32800_sxx (KERN_ATTR_VECTOR ())
{
/**
* modifier

2
src/modules/module_32800.c
View File

@ -16,7 +16,7 @@ static const u32 DGST_POS1 = 3;
static const u32 DGST_POS2 = 2;
static const u32 DGST_POS3 = 1;
static const u32 DGST_SIZE = DGST_SIZE_4_4;
static const u32 HASH_CATEGORY = HASH_CATEGORY_RAW_HASH;
static const u32 HASH_CATEGORY = HASH_CATEGORY_RAW_HASH_SALTED;
static const char *HASH_NAME = "md5(sha1(md5($pass)))";
static const u64 KERN_TYPE = 32800;
static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE