arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2025-06-27 18:32:36 +00:00
Code Issues Releases Wiki Activity

Fix m14600 confusing error message on container without payload data

Browse Source 
When multiple error messages are available, prioritize any parsing error
over PARSER_LUKS_KEY_DISABLED.

This takes priority since it  more meaningfull to report to user.
This commit is contained in:
Rick van der Zwet 2022-11-17 20:59:09 +01:00
parent c35d8ecfd4
commit 1b663b02fe
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/modules/module_14600.c
View File

@ -242,8 +242,11 @@ int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE
const int parser_status = module_hash_decode (hashconfig, hash->digest, hash->salt, hash->esalt, hash->hook_salt, hash->hash_info, hashes->hashfile, strlen (hashes->hashfile)); const int parser_status = module_hash_decode (hashconfig, hash->digest, hash->salt, hash->esalt, hash->hook_salt, hash->hash_info, hashes->hashfile, strlen (hashes->hashfile));
if (parser_status != PARSER_OK) if (parser_status != PARSER_OK)
{
if (parser_status != PARSER_LUKS_KEY_DISABLED)
{ {
last_error = parser_status; last_error = parser_status;
}
continue; continue;
} }
@ -251,10 +254,17 @@ int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE
} }
if (hashes_cnt == 0) if (hashes_cnt == 0)
{
if (last_error != 0)
{ {
return last_error; return last_error;
} }
else else
{
return PARSER_LUKS_KEY_DISABLED;
}
}
else
{ {
return hashes_cnt; return hashes_cnt;
} }