1
0
mirror of https://github.com/hashcat/hashcat.git synced 2025-02-02 19:01:09 +00:00

Merge pull request #1333 from philsmd/master

fixes #1278: allow the '#' character within the username of DCC2 hashes
This commit is contained in:
Jens Steube 2017-08-17 11:52:12 +02:00 committed by GitHub
commit c92b4e1eb2
2 changed files with 4 additions and 1 deletions

View File

@ -26,6 +26,7 @@
- Fixed the version number used in the restore file header - Fixed the version number used in the restore file header
- Fixed the parsing of command line options. It doesn't show two times the same error about an invalid option anymore. - Fixed the parsing of command line options. It doesn't show two times the same error about an invalid option anymore.
- Fixed the estimated time value whenever the value is very large and overflows - Fixed the estimated time value whenever the value is very large and overflows
- Fixed the parsing of DCC2 hashes by allowing the "#" character within the user name
## ##
## Improvements ## Improvements

View File

@ -3063,7 +3063,9 @@ int dcc2_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSE
salt_pos++; salt_pos++;
u8 *digest_pos = (u8 *) strchr ((const char *) salt_pos, '#'); // search last '#' from the end since the username can consist of a '#' too
u8 *digest_pos = (u8 *) strrchr ((const char *) salt_pos, '#');
if (digest_pos == NULL) return (PARSER_SEPARATOR_UNMATCHED); if (digest_pos == NULL) return (PARSER_SEPARATOR_UNMATCHED);