github/hashcat
1
Fork 0
mirror of https://github.com/hashcat/hashcat synced 2024-11-02 20:39:22 +01:00
Code Releases Activity

Merge pull request #284 from philsmd/master

Browse Source 
fixed -m 10200 parser: check for NULL pointers ASAP, check base64 input length
This commit is contained in:
Jens Steube 2016-04-03 10:12:25 +02:00
commit 0d86acf296
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/changes.txt
View File

@ -184,6 +184,10 @@ Type.: Bug
File.: Host
Desc.: Fixed some checks in the parser of -m 8900 = scrypt
Type.: Bug
File.: Host
Desc.: Fixed some checks in the parser of -m 10200 = Cram MD5
* changes v2.00 -> v2.01:
Type.: Bug

12
src/shared.c
View File

@ -16182,16 +16182,18 @@ int crammd5_parse_hash (char *input_buf, uint input_len, hash_t *hash_buf)
char *hash_pos = strchr (salt_pos, '$');
uint salt_len = hash_pos - salt_pos;
if (hash_pos == NULL) return (PARSER_SEPARATOR_UNMATCHED);
uint salt_len = hash_pos - salt_pos;
hash_pos++;
uint hash_len = input_len - 10 - salt_len - 1;
// base64 decode salt
if (salt_len > 133) return (PARSER_SALT_LENGTH);
u8 tmp_buf[100] = { 0 };
salt_len = base64_decode (base64_to_int, (const u8 *) salt_pos, salt_len, tmp_buf);
@ -16204,12 +16206,16 @@ int crammd5_parse_hash (char *input_buf, uint input_len, hash_t *hash_buf)
salt->salt_len = salt_len;
// base64 decode salt
// base64 decode hash
if (hash_len > 133) return (PARSER_HASH_LENGTH);
memset (tmp_buf, 0, sizeof (tmp_buf));
hash_len = base64_decode (base64_to_int, (const u8 *) hash_pos, hash_len, tmp_buf);
if (hash_len < 32 + 1) return (PARSER_SALT_LENGTH);
uint user_len = hash_len - 32;
const u8 *tmp_hash = tmp_buf + user_len;