mirror of
https://github.com/hashcat/hashcat.git
synced 2025-07-10 00:28:11 +00:00
Merge pull request #3511 from rickvanderzwet/issue-3484-m14600-error-handling-on-container-without-payload
Fix m14600 confusing error message on container without payload data
This commit is contained in:
commit
b3095acc8b
@ -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;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user