mirror of
https://github.com/hashcat/hashcat.git
synced 2024-12-23 23:19:09 +00:00
Allow module_hash_binary_parse to report a fatal error
If module_hash_binary_parse is completely unable to successfully parse out any hashes, up until now the output has been ``` Hashfile 'foo': Success ``` which is less than helpful. This patch allows (but does not require) m_h_binary_parse to report a useful error response, by returning a negative value. Modules which continue to return '0 hashes' will get the same less-than-useful behaviour they always hace. I've also modified the LUKS module to report a useful error, as a proof of concept. Further expansions on this could include: * Applying similar behaviour to module_hash_binary_count, so it too can report errors when trying to count hashes. This would require more co-ordinated change, because m_h_binary_count already uses -1 to indicate a system error. * Allow and encourage modules to print their own errors and warnings during parsing. This would allow for situations where a single hash in a multi-hash file could be reported as malformed, without having to fail the whole parse. However, implementing this would, I expect, require modules to have access to `hashcat_ctx`, which... yeah. Not so straightforward.
This commit is contained in:
parent
c5d2d5396f
commit
b4204d265d
@ -1296,10 +1296,14 @@ int hashes_init_stage1 (hashcat_ctx_t *hashcat_ctx)
|
|||||||
{
|
{
|
||||||
hashes_cnt = hashes_parsed;
|
hashes_cnt = hashes_parsed;
|
||||||
}
|
}
|
||||||
else
|
else if (hashes_parsed == 0)
|
||||||
{
|
{
|
||||||
event_log_warning (hashcat_ctx, "Hashfile '%s': %s", hashes->hashfile, strerror (errno));
|
event_log_warning (hashcat_ctx, "Hashfile '%s': %s", hashes->hashfile, strerror (errno));
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
event_log_warning (hashcat_ctx, "Hashfile '%s': %s", hashes->hashfile, strparser (hashes_parsed));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -235,6 +235,7 @@ int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE
|
|||||||
hash_t *hashes_buf = hashes->hashes_buf;
|
hash_t *hashes_buf = hashes->hashes_buf;
|
||||||
|
|
||||||
int hashes_cnt = 0;
|
int hashes_cnt = 0;
|
||||||
|
int last_error = 0;
|
||||||
|
|
||||||
for (int keyslot_idx = 0; keyslot_idx < LUKS_NUMKEYS; keyslot_idx++)
|
for (int keyslot_idx = 0; keyslot_idx < LUKS_NUMKEYS; keyslot_idx++)
|
||||||
{
|
{
|
||||||
@ -246,13 +247,24 @@ 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) continue;
|
if (parser_status != PARSER_OK)
|
||||||
|
{
|
||||||
|
last_error = parser_status;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
hashes_cnt++;
|
hashes_cnt++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (hashes_cnt == 0)
|
||||||
|
{
|
||||||
|
return last_error;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
return hashes_cnt;
|
return hashes_cnt;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
u64 module_kern_type_dynamic (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const void *digest_buf, MAYBE_UNUSED const salt_t *salt, MAYBE_UNUSED const void *esalt_buf, MAYBE_UNUSED const void *hook_salt_buf, MAYBE_UNUSED const hashinfo_t *hash_info)
|
u64 module_kern_type_dynamic (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const void *digest_buf, MAYBE_UNUSED const salt_t *salt, MAYBE_UNUSED const void *esalt_buf, MAYBE_UNUSED const void *hook_salt_buf, MAYBE_UNUSED const hashinfo_t *hash_info)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user