mirror of
https://github.com/hashcat/hashcat.git
synced 2025-02-02 02:41:35 +00:00
Some small corrections on salt length for MD5-ASA
This commit is contained in:
parent
80324918e9
commit
f87ac21065
@ -1054,8 +1054,8 @@ typedef enum display_len
|
||||
DISPLAY_LEN_MAX_2100 = 6 + 5 + 1 + SALT_MAX + 1 + 32,
|
||||
DISPLAY_LEN_MIN_2400 = 16,
|
||||
DISPLAY_LEN_MAX_2400 = 16,
|
||||
DISPLAY_LEN_MIN_2410 = 16 + 1 + 0,
|
||||
DISPLAY_LEN_MAX_2410 = 16 + 1 + 16,
|
||||
DISPLAY_LEN_MIN_2410 = 16 + 1 + 1,
|
||||
DISPLAY_LEN_MAX_2410 = 16 + 1 + 4,
|
||||
DISPLAY_LEN_MIN_2600 = 32,
|
||||
DISPLAY_LEN_MAX_2600 = 32,
|
||||
DISPLAY_LEN_MIN_3000 = 16,
|
||||
@ -1068,8 +1068,10 @@ typedef enum display_len
|
||||
DISPLAY_LEN_MAX_4300 = 32,
|
||||
DISPLAY_LEN_MIN_4500 = 40,
|
||||
DISPLAY_LEN_MAX_4500 = 40,
|
||||
DISPLAY_LEN_MIN_4520 = 40 + 1 + 1,
|
||||
DISPLAY_LEN_MAX_4520 = 40 + 1 + 64,
|
||||
DISPLAY_LEN_MIN_4520 = 40 + 1 + 0,
|
||||
DISPLAY_LEN_MAX_4520 = 40 + 1 + SALT_MAX,
|
||||
DISPLAY_LEN_MIN_4520H = 40 + 1 + 0,
|
||||
DISPLAY_LEN_MAX_4520H = 40 + 1 + (SALT_MAX * 2),
|
||||
DISPLAY_LEN_MIN_4800 = 32 + 1 + 32 + 1 + 2,
|
||||
DISPLAY_LEN_MAX_4800 = 32 + 1 + 32 + 1 + 2,
|
||||
DISPLAY_LEN_MIN_5000 = 16,
|
||||
|
@ -4811,7 +4811,14 @@ int sha1s_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUS
|
||||
|
||||
int sha1sha1_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSED const hashconfig_t *hashconfig)
|
||||
{
|
||||
if ((input_len < DISPLAY_LEN_MIN_4520) || (input_len > DISPLAY_LEN_MAX_4520)) return (PARSER_GLOBAL_LENGTH);
|
||||
if (hashconfig->opts_type & OPTS_TYPE_ST_HEX)
|
||||
{
|
||||
if ((input_len < DISPLAY_LEN_MIN_4520H) || (input_len > DISPLAY_LEN_MAX_4520H)) return (PARSER_GLOBAL_LENGTH);
|
||||
}
|
||||
else
|
||||
{
|
||||
if ((input_len < DISPLAY_LEN_MIN_4520) || (input_len > DISPLAY_LEN_MAX_4520)) return (PARSER_GLOBAL_LENGTH);
|
||||
}
|
||||
|
||||
u32 *digest = (u32 *) hash_buf->digest;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user