mirror of
https://github.com/hashcat/hashcat.git
synced 2024-12-23 07:08:19 +00:00
Merge branch 'master' into fix_opti_null
This commit is contained in:
commit
8e08efa6e0
@ -80,7 +80,7 @@ KERNEL_FQ void m03730_mxx (KERN_ATTR_VECTOR_ESALT (md5_double_salt_t))
|
||||
|
||||
const u32 salt_len = esalt_bufs[DIGESTS_OFFSET_HOST].salt1_len;
|
||||
|
||||
u32 s[64] = { 0 };
|
||||
u32x s[64] = { 0 };
|
||||
|
||||
for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1)
|
||||
{
|
||||
@ -89,7 +89,7 @@ KERNEL_FQ void m03730_mxx (KERN_ATTR_VECTOR_ESALT (md5_double_salt_t))
|
||||
|
||||
const u32 salt_len2 = esalt_bufs[DIGESTS_OFFSET_HOST].salt2_len;
|
||||
|
||||
u32 s2[64] = { 0 };
|
||||
u32x s2[64] = { 0 };
|
||||
|
||||
for (u32 i = 0, idx = 0; i < salt_len2; i += 4, idx += 1)
|
||||
{
|
||||
@ -232,7 +232,7 @@ KERNEL_FQ void m03730_sxx (KERN_ATTR_VECTOR_ESALT (md5_double_salt_t))
|
||||
|
||||
const u32 salt_len = esalt_bufs[DIGESTS_OFFSET_HOST].salt1_len;
|
||||
|
||||
u32 s[64] = { 0 };
|
||||
u32x s[64] = { 0 };
|
||||
|
||||
for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1)
|
||||
{
|
||||
@ -241,7 +241,7 @@ KERNEL_FQ void m03730_sxx (KERN_ATTR_VECTOR_ESALT (md5_double_salt_t))
|
||||
|
||||
const u32 salt_len2 = esalt_bufs[DIGESTS_OFFSET_HOST].salt2_len;
|
||||
|
||||
u32 s2[64] = { 0 };
|
||||
u32x s2[64] = { 0 };
|
||||
|
||||
for (u32 i = 0, idx = 0; i < salt_len2; i += 4, idx += 1)
|
||||
{
|
||||
|
@ -391,7 +391,7 @@ KERNEL_FQ void m18400_comp (KERN_ATTR_TMPS_ESALT (odf12_tmp_t, odf12_t))
|
||||
|
||||
if (remaining64)
|
||||
{
|
||||
u32 *pt_remaining = pt + (encrypted_len64 / 4);
|
||||
PRIVATE_AS u32 *pt_remaining = pt + (encrypted_len64 / 4);
|
||||
|
||||
truncate_block_16x4_be_S (pt_remaining + 0, pt_remaining + 4, pt_remaining + 8, pt_remaining + 12, remaining64);
|
||||
|
||||
|
@ -797,7 +797,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE_COMP) m18600_comp (KERN_ATTR_
|
||||
|
||||
if (remaining64)
|
||||
{
|
||||
u32 *pt_remaining = pt + (encrypted_len64 / 4);
|
||||
PRIVATE_AS u32 *pt_remaining = pt + (encrypted_len64 / 4);
|
||||
|
||||
truncate_block_16x4_be_S (pt_remaining + 0, pt_remaining + 4, pt_remaining + 8, pt_remaining + 12, remaining64);
|
||||
|
||||
|
@ -80,7 +80,7 @@ KERNEL_FQ void m31700_mxx (KERN_ATTR_VECTOR_ESALT (md5_double_salt_t))
|
||||
|
||||
const u32 salt1_len = esalt_bufs[DIGESTS_OFFSET_HOST].salt1_len;
|
||||
|
||||
u32 salt1_buf[64] = { 0 };
|
||||
u32x salt1_buf[64] = { 0 };
|
||||
|
||||
for (u32 i = 0, idx = 0; i < salt1_len; i += 4, idx += 1)
|
||||
{
|
||||
@ -89,7 +89,7 @@ KERNEL_FQ void m31700_mxx (KERN_ATTR_VECTOR_ESALT (md5_double_salt_t))
|
||||
|
||||
const u32 salt2_len = esalt_bufs[DIGESTS_OFFSET_HOST].salt2_len;
|
||||
|
||||
u32 salt2_buf[64] = { 0 };
|
||||
u32x salt2_buf[64] = { 0 };
|
||||
|
||||
for (u32 i = 0, idx = 0; i < salt2_len; i += 4, idx += 1)
|
||||
{
|
||||
@ -245,7 +245,7 @@ KERNEL_FQ void m31700_sxx (KERN_ATTR_VECTOR_ESALT (md5_double_salt_t))
|
||||
|
||||
const u32 salt1_len = esalt_bufs[DIGESTS_OFFSET_HOST].salt1_len;
|
||||
|
||||
u32 salt1_buf[64] = { 0 };
|
||||
u32x salt1_buf[64] = { 0 };
|
||||
|
||||
for (u32 i = 0, idx = 0; i < salt1_len; i += 4, idx += 1)
|
||||
{
|
||||
@ -254,7 +254,7 @@ KERNEL_FQ void m31700_sxx (KERN_ATTR_VECTOR_ESALT (md5_double_salt_t))
|
||||
|
||||
const u32 salt2_len = esalt_bufs[DIGESTS_OFFSET_HOST].salt2_len;
|
||||
|
||||
u32 salt2_buf[64] = { 0 };
|
||||
u32x salt2_buf[64] = { 0 };
|
||||
|
||||
for (u32 i = 0, idx = 0; i < salt2_len; i += 4, idx += 1)
|
||||
{
|
||||
|
@ -51,7 +51,11 @@
|
||||
- Skip chained generated rules that exceed the maximum number of function calls
|
||||
- Fixed incorrect plaintext check for 25400 and 26610. Increased plaintext check to 32 bytes to prevent false positives.
|
||||
- Fixed bug in --stdout that caused certain rules to malfunction
|
||||
- Fixed build failed for 18400 with Apple Metal
|
||||
- Fixed build failed for 18600 with Apple Metal
|
||||
- Fixed display problem of the "Optimizers applied" list for algorithms using OPTI_TYPE_SLOW_HASH_SIMD_INIT2 and/or OPTI_TYPE_SLOW_HASH_SIMD_LOOP2
|
||||
- Fixed incompatible pointer types (salt1 and salt2 buf) in 31700 a3 kernel
|
||||
- Fixed incompatible pointer types (salt1 and salt2 buf) in 3730 a3 kernel
|
||||
- Handle signed/unsigned PDF permission P value for all PDF hash-modes
|
||||
|
||||
##
|
||||
|
Loading…
Reference in New Issue
Block a user