mirror of
https://github.com/hashcat/hashcat.git
synced 2025-01-10 15:51:10 +00:00
Fix m14600 confusing error message on container without payload data
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:
parent
c35d8ecfd4
commit
1b663b02fe
@ -243,7 +243,10 @@ int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE
|
||||
|
||||
if (parser_status != PARSER_OK)
|
||||
{
|
||||
last_error = parser_status;
|
||||
if (parser_status != PARSER_LUKS_KEY_DISABLED)
|
||||
{
|
||||
last_error = parser_status;
|
||||
}
|
||||
continue;
|
||||
}
|
||||
|
||||
@ -252,7 +255,14 @@ int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE
|
||||
|
||||
if (hashes_cnt == 0)
|
||||
{
|
||||
return last_error;
|
||||
if (last_error != 0)
|
||||
{
|
||||
return last_error;
|
||||
}
|
||||
else
|
||||
{
|
||||
return PARSER_LUKS_KEY_DISABLED;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user