1
0
mirror of https://github.com/hashcat/hashcat.git synced 2024-12-26 08:28:20 +00:00

Merge pull request #281 from philsmd/master

fixed base64_decode () input length validation for -m 8900
This commit is contained in:
Jens Steube 2016-04-02 13:36:03 +02:00
commit d0e7ee6824
2 changed files with 9 additions and 1 deletions

View File

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

View File

@ -14688,9 +14688,13 @@ int scrypt_parse_hash (char *input_buf, uint input_len, hash_t *hash_buf)
// base64 decode
int salt_len_base64 = hash_pos - saltbuf_pos;
if (salt_len_base64 > 45) return (PARSER_SALT_LENGTH);
u8 tmp_buf[33] = { 0 };
int tmp_len = base64_decode (base64_to_int, (const u8 *) saltbuf_pos, hash_pos - saltbuf_pos, tmp_buf);
int tmp_len = base64_decode (base64_to_int, (const u8 *) saltbuf_pos, salt_len_base64, tmp_buf);
char *salt_buf_ptr = (char *) salt->salt_buf;