arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2025-01-11 16:21:12 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1271 from DoZ10/chacha20

Browse Source 
Chacha20: Fixed error in format parser separator validation
This commit is contained in:
Jens Steube 2017-06-08 19:15:25 +02:00 committed by GitHub
commit 9d49ae547b
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/interface.c
View File

@ -5492,26 +5492,31 @@ int chacha20_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_U
salt_t *salt = (salt_t *) hash_buf->salt;
u8 *position_marker = (u8 *) strchr ((const char *) input_buf, '*') + 1;
u8 *position_marker = (u8 *) strchr ((const char *) input_buf, '*');
if (position_marker == NULL) return (PARSER_SEPARATOR_UNMATCHED);
position_marker++;
if (is_valid_hex_string (position_marker, 16) == false) return (PARSER_SALT_ENCODING);
u8 *offset_marker = (u8 *) strchr ((const char *) position_marker, '*') + 1;
u8 *offset_marker = (u8 *) strchr ((const char *) position_marker, '*');
if (offset_marker == NULL) return (PARSER_SEPARATOR_UNMATCHED);
offset_marker++;
int offset = atoi ((char*) offset_marker);
if (offset > 63) return (PARSER_SALT_VALUE);
u8 *iv_marker = (u8 *) strchr ((const char *) offset_marker, '*') + 1;
u8 *iv_marker = (u8 *) strchr ((const char *) offset_marker, '*');
if (iv_marker == NULL) return (PARSER_SEPARATOR_UNMATCHED);
iv_marker++;
if (is_valid_hex_string (iv_marker, 16) == false) return (PARSER_SALT_ENCODING);
u8 *plain_marker = (u8 *) strchr ((const char *) iv_marker, '*') + 1;
u8 *plain_marker = (u8 *) strchr ((const char *) iv_marker, '*');
if (plain_marker == NULL) return (PARSER_SEPARATOR_UNMATCHED);
plain_marker++;
if (is_valid_hex_string (plain_marker, 16) == false) return (PARSER_SALT_ENCODING);
u8 *cipher_marker = (u8 *) strchr ((const char *) plain_marker, '*') + 1;
u8 *cipher_marker = (u8 *) strchr ((const char *) plain_marker, '*');
if (cipher_marker == NULL) return (PARSER_SEPARATOR_UNMATCHED);
cipher_marker++;
if (is_valid_hex_string (cipher_marker, 16) == false) return (PARSER_SALT_ENCODING);
chacha20->iv[0] = hex_to_u32 ((const u8 *) iv_marker + 8);