github/hashcat
1
Fork 0
mirror of https://github.com/hashcat/hashcat synced 2025-03-26 12:12:43 +01:00
Code Releases Activity

verify separator also with TOKEN_ATTR_FIXED_LENGTH

Browse Source
This commit is contained in:
Gabriele Gristina 2023-04-23 01:41:00 +02:00
parent 95bfc80378
commit 0d992a9ea3
1 changed files with 21 additions and 32 deletions

53
src/shared.c

@ -1153,17 +1153,6 @@ int input_tokenizer (const u8 *input_buf, const int input_len, hc_token_t *token
int len = token->len[token_idx]; int len = token->len[token_idx];
if (len_left < len) return (PARSER_TOKEN_LENGTH); if (len_left < len) return (PARSER_TOKEN_LENGTH);
token->buf[token_idx + 1] = token->buf[token_idx] + len;
len_left -= len;
if (token->sep[token_idx] != 0)
{
token->buf[token_idx + 1]++; // +1 = separator
len_left--; // -1 = separator
}
} }
else else
{ {
@ -1182,28 +1171,28 @@ int input_tokenizer (const u8 *input_buf, const int input_len, hc_token_t *token
len_left -= len + 1; // +1 = separator len_left -= len + 1; // +1 = separator
} }
} }
const u8 *next_pos = NULL;
if (token->attr[token_idx] & TOKEN_ATTR_SEPARATOR_FARTHEST)
{
next_pos = hc_strchr_last (token->buf[token_idx], len_left, token->sep[token_idx]);
}
else
{
next_pos = hc_strchr_next (token->buf[token_idx], len_left, token->sep[token_idx]);
}
if (next_pos == NULL) return (PARSER_SEPARATOR_UNMATCHED);
const int len = next_pos - token->buf[token_idx];
token->len[token_idx] = len;
token->buf[token_idx + 1] = next_pos + 1; // +1 = separator
len_left -= len + 1; // +1 = separator
} }
const u8 *next_pos = NULL;
if (token->attr[token_idx] & TOKEN_ATTR_SEPARATOR_FARTHEST)
{
next_pos = hc_strchr_last (token->buf[token_idx], len_left, token->sep[token_idx]);
}
else
{
next_pos = hc_strchr_next (token->buf[token_idx], len_left, token->sep[token_idx]);
}
if (next_pos == NULL) return (PARSER_SEPARATOR_UNMATCHED);
const int len = next_pos - token->buf[token_idx];
token->len[token_idx] = len;
token->buf[token_idx + 1] = next_pos + 1; // +1 = separator
len_left -= len + 1; // +1 = separator
} }
if (token->attr[token_idx] & TOKEN_ATTR_FIXED_LENGTH) if (token->attr[token_idx] & TOKEN_ATTR_FIXED_LENGTH)