arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2025-01-08 14:51:10 +00:00
Code Issues Releases Wiki Activity

Add tokenizer support for TOKEN_ATTR_VERIFY_FLOAT

Browse Source
This commit is contained in:
Jens Steube 2019-10-02 14:18:26 +02:00
parent 7f4df9ebff
commit b197610811
4 changed files with 38 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/convert.h
View File

@ -24,6 +24,8 @@ bool is_valid_hex_string (const u8 *s, const size_t len);
bool is_valid_hex_char (const u8 c);
bool is_valid_digit_string (const u8 *s, const size_t len);
bool is_valid_digit_char (const u8 c);
bool is_valid_float_string (const u8 *s, const size_t len);
bool is_valid_float_char (const u8 c);
u8 hex_convert (const u8 c);

9
include/types.h
View File

@ -758,10 +758,11 @@ typedef enum token_attr
TOKEN_ATTR_VERIFY_SIGNATURE = 1 << 2,
TOKEN_ATTR_VERIFY_LENGTH = 1 << 3,
TOKEN_ATTR_VERIFY_DIGIT = 1 << 4,
TOKEN_ATTR_VERIFY_HEX = 1 << 5,
TOKEN_ATTR_VERIFY_BASE64A = 1 << 6,
TOKEN_ATTR_VERIFY_BASE64B = 1 << 7,
TOKEN_ATTR_VERIFY_BASE64C = 1 << 8
TOKEN_ATTR_VERIFY_FLOAT = 1 << 5,
TOKEN_ATTR_VERIFY_HEX = 1 << 6,
TOKEN_ATTR_VERIFY_BASE64A = 1 << 7,
TOKEN_ATTR_VERIFY_BASE64B = 1 << 8,
TOKEN_ATTR_VERIFY_BASE64C = 1 << 9
} token_attr_t;

21
src/convert.c
View File

@ -311,6 +311,27 @@ bool is_valid_hex_char (const u8 c)
return false;
}
bool is_valid_float_string (const u8 *s, const size_t len)
{
for (size_t i = 0; i < len; i++)
{
const u8 c = s[i];
if (is_valid_float_char (c) == false) return false;
}
return true;
}
bool is_valid_float_char (const u8 c)
{
if ((c >= '0') && (c <= '9')) return true;
if (c == '.') return true;
return false;
}
bool is_valid_digit_string (const u8 *s, const size_t len)
{
for (size_t i = 0; i < len; i++)

10
src/shared.c
View File

@ -1092,6 +1092,16 @@ int input_tokenizer (const u8 *input_buf, const int input_len, token_t *token)
if (token->len[token_idx] > token->len_max[token_idx]) return (PARSER_TOKEN_LENGTH);
}
if (token->attr[token_idx] & TOKEN_ATTR_VERIFY_DIGIT)
{
if (is_valid_digit_string (token->buf[token_idx], token->len[token_idx]) == false) return (PARSER_TOKEN_ENCODING);
}
if (token->attr[token_idx] & TOKEN_ATTR_VERIFY_FLOAT)
{
if (is_valid_float_string (token->buf[token_idx], token->len[token_idx]) == false) return (PARSER_TOKEN_ENCODING);
}
if (token->attr[token_idx] & TOKEN_ATTR_VERIFY_HEX)
{
if (is_valid_hex_string (token->buf[token_idx], token->len[token_idx]) == false) return (PARSER_TOKEN_ENCODING);