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

Merge pull request #991 from philsmd/master

Browse Source 
-m 11600: allow hashes with compressions different from LZMA1/LZMA2
This commit is contained in:
Jens Steube 2017-01-24 16:17:57 +01:00 committed by GitHub
commit 7ee5fe7f1c
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/interface.c
View File

@ -11198,13 +11198,9 @@ int seven_zip_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_
* verify some data * verify some data
*/ */
if (data_type > 2) if (data_type == 0x80) // 0x80 is a special case and means "truncated"
{ {
// 0x80 is special case and means "truncated" // we always should have a data_len of exactly 16 if the data was truncated
if (data_type != 0x80) return (PARSER_SALT_VALUE);
// if 0x80 (truncated), we always should have a data_len of exactly 16
if (data_len != 16) return (PARSER_SALT_VALUE); if (data_len != 16) return (PARSER_SALT_VALUE);
} }
@ -13779,8 +13775,12 @@ void seven_zip_hook_func (hc_device_param_t *device_param, hashes_t *hashes, con
} }
} }
if (data_type == 0x80) // truncated if (data_type > 2)
{ {
// This decompression is currently not supported
// this check implies also this case:
// if (data_type == 0x80) // truncated
// we can't do a full CRC check since data in this case is truncated // we can't do a full CRC check since data in this case is truncated
// could lead to a higher number of false positives in very rare cases // could lead to a higher number of false positives in very rare cases