mirror of
https://github.com/hashcat/hashcat.git
synced 2024-11-28 19:08:19 +00:00
Merge pull request #3824 from mohemiv/fix-23900-32060
Removed duplicate lines from 23900 and 32060
This commit is contained in:
commit
d0d07daf91
@ -2211,7 +2211,6 @@ int hashes_init_stage3 (hashcat_ctx_t *hashcat_ctx)
|
||||
hashes->digests_done_zero = digests_done_zero;
|
||||
hashes->digests_done_pot = digests_done_pot;
|
||||
|
||||
hashes->salts_cnt = salts_cnt;
|
||||
hashes->salts_done = salts_done;
|
||||
|
||||
return 0;
|
||||
|
@ -557,8 +557,6 @@ bool module_potfile_custom_check (MAYBE_UNUSED const hashconfig_t *hashconfig, M
|
||||
kernel_param.digests_offset_host = 0;
|
||||
kernel_param.combs_mode = 0;
|
||||
kernel_param.salt_repeat = 0;
|
||||
kernel_param.combs_mode = 0;
|
||||
kernel_param.salt_repeat = 0;
|
||||
kernel_param.pws_pos = 0;
|
||||
kernel_param.gid_max = 1;
|
||||
|
||||
|
@ -533,8 +533,6 @@ bool module_potfile_custom_check (MAYBE_UNUSED const hashconfig_t *hashconfig, M
|
||||
kernel_param.digests_offset_host = 0;
|
||||
kernel_param.combs_mode = 0;
|
||||
kernel_param.salt_repeat = 0;
|
||||
kernel_param.combs_mode = 0;
|
||||
kernel_param.salt_repeat = 0;
|
||||
kernel_param.pws_pos = 0;
|
||||
kernel_param.gid_max = 1;
|
||||
|
||||
|
@ -139,8 +139,6 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
|
||||
token.attr[3] = TOKEN_ATTR_VERIFY_LENGTH
|
||||
| TOKEN_ATTR_VERIFY_DIGIT;
|
||||
|
||||
if (line_len < 16) return (PARSER_SALT_LENGTH);
|
||||
|
||||
const u8 version = line_buf[10];
|
||||
|
||||
if (version == '1')
|
||||
|
@ -269,8 +269,6 @@ bool module_potfile_custom_check (MAYBE_UNUSED const hashconfig_t *hashconfig, M
|
||||
kernel_param.digests_offset_host = 0;
|
||||
kernel_param.combs_mode = 0;
|
||||
kernel_param.salt_repeat = 0;
|
||||
kernel_param.combs_mode = 0;
|
||||
kernel_param.salt_repeat = 0;
|
||||
kernel_param.pws_pos = 0;
|
||||
kernel_param.gid_max = 1;
|
||||
|
||||
|
@ -291,8 +291,6 @@ bool module_potfile_custom_check (MAYBE_UNUSED const hashconfig_t *hashconfig, M
|
||||
kernel_param.digests_offset_host = 0;
|
||||
kernel_param.combs_mode = 0;
|
||||
kernel_param.salt_repeat = 0;
|
||||
kernel_param.combs_mode = 0;
|
||||
kernel_param.salt_repeat = 0;
|
||||
kernel_param.pws_pos = 0;
|
||||
kernel_param.gid_max = 1;
|
||||
|
||||
|
@ -582,8 +582,6 @@ bool module_potfile_custom_check (MAYBE_UNUSED const hashconfig_t *hashconfig, M
|
||||
kernel_param.digests_offset_host = 0;
|
||||
kernel_param.combs_mode = 0;
|
||||
kernel_param.salt_repeat = 0;
|
||||
kernel_param.combs_mode = 0;
|
||||
kernel_param.salt_repeat = 0;
|
||||
kernel_param.pws_pos = 0;
|
||||
kernel_param.gid_max = 1;
|
||||
|
||||
|
@ -584,8 +584,6 @@ bool module_potfile_custom_check (MAYBE_UNUSED const hashconfig_t *hashconfig, M
|
||||
kernel_param.digests_offset_host = 0;
|
||||
kernel_param.combs_mode = 0;
|
||||
kernel_param.salt_repeat = 0;
|
||||
kernel_param.combs_mode = 0;
|
||||
kernel_param.salt_repeat = 0;
|
||||
kernel_param.pws_pos = 0;
|
||||
kernel_param.gid_max = 1;
|
||||
|
||||
|
@ -143,9 +143,6 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
|
||||
|
||||
if (parse_rc == false) return (PARSER_SALT_LENGTH);
|
||||
|
||||
salt->salt_buf[0] = salt->salt_buf[0];
|
||||
salt->salt_buf[1] = salt->salt_buf[1];
|
||||
|
||||
salt->salt_buf[0] = byte_swap_32 (salt->salt_buf[0]);
|
||||
salt->salt_buf[1] = byte_swap_32 (salt->salt_buf[1]);
|
||||
|
||||
|
@ -149,8 +149,6 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
|
||||
token.attr[3] = TOKEN_ATTR_VERIFY_LENGTH
|
||||
| TOKEN_ATTR_VERIFY_DIGIT;
|
||||
|
||||
if (line_len < 16) return (PARSER_SALT_LENGTH);
|
||||
|
||||
const u8 version = line_buf[10];
|
||||
|
||||
if (version == '1')
|
||||
|
@ -22,7 +22,6 @@ static const u64 KERN_TYPE = 10900;
|
||||
static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE
|
||||
| OPTI_TYPE_SLOW_HASH_SIMD_LOOP;
|
||||
static const u64 OPTS_TYPE = OPTS_TYPE_STOCK_MODULE
|
||||
| OPTS_TYPE_ST_BASE64
|
||||
| OPTS_TYPE_PT_GENERATE_LE
|
||||
| OPTS_TYPE_ST_BASE64;
|
||||
static const u32 SALT_TYPE = SALT_TYPE_EMBEDDED;
|
||||
|
Loading…
Reference in New Issue
Block a user