1
0
mirror of https://github.com/hashcat/hashcat.git synced 2024-12-23 15:18:16 +00:00

Merge pull request #264 from philsmd/master

added some checks to the -m 111 parser
This commit is contained in:
Jens Steube 2016-03-11 19:50:00 +01:00
commit 94912b382e
2 changed files with 11 additions and 1 deletions

View File

@ -151,6 +151,10 @@ Type.: Bug
File.: Host
Desc.: Fixed a bug in line counter: Conditional jump or move depends on uninitialised value
Type.: Bug
File.: Host
Desc.: Fixed some checks in the parser of -m 111 = nsldaps, SSHA-1(Base64), Netscape LDAP SSHA
* changes v2.00 -> v2.01:
Type.: Bug

View File

@ -11639,9 +11639,15 @@ int sha1b64s_parse_hash (char *input_buf, uint input_len, hash_t *hash_buf)
int tmp_len = base64_decode (base64_to_int, (const u8 *) input_buf + 6, input_len - 6, tmp_buf);
if (tmp_len < 20) return (PARSER_HASH_LENGTH);
memcpy (digest, tmp_buf, 20);
salt->salt_len = tmp_len - 20;
int salt_len = tmp_len - 20;
if (salt_len < 0) return (PARSER_SALT_LENGTH);
salt->salt_len = salt_len;
memcpy (salt->salt_buf, tmp_buf + 20, salt->salt_len);