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

Added user advice if a hash throws 'token length exception'

Browse Source
This commit is contained in:
Jens Steube 2022-05-04 14:26:53 +02:00
parent 39b768a620
commit 5977edb1d2
3 changed files with 50 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changes.txt
View File

@ -27,6 +27,7 @@
- Added parameter to Bitwarden mode for second iteration count
- Added support to use 'John the Ripper' hash format with hash-type 13100
- Added support to use 'John the Ripper' hash format with hash-type 18200
- Added user advice if a hash throws 'token length exception'
##
## Bugs

2
include/types.h
View File

@ -974,6 +974,8 @@ typedef struct hashes
void *st_esalts_buf;
void *st_hook_salts_buf;
int parser_token_length_cnt;
} hashes_t;
typedef struct hashconfig

47
src/hashes.c
View File

@ -869,6 +869,8 @@ int hashes_init_filename (hashcat_ctx_t *hashcat_ctx)
}
}
hashes->parser_token_length_cnt = 0;
return 0;
}
@ -1252,6 +1254,11 @@ int hashes_init_stage1 (hashcat_ctx_t *hashcat_ctx)
event_log_warning (hashcat_ctx, "Hash '%s': %s", input_buf, strparser (parser_status));
}
if (parser_status == PARSER_TOKEN_LENGTH)
{
hashes->parser_token_length_cnt++;
}
hash = &hashes_buf[hashes_cnt];
parser_status = module_ctx->module_hash_decode (hashconfig, hash->digest, hash->salt, hash->esalt, hash->hook_salt, hash->hash_info, hash_buf + 16, 16);
@ -1281,6 +1288,11 @@ int hashes_init_stage1 (hashcat_ctx_t *hashcat_ctx)
{
event_log_warning (hashcat_ctx, "Hash '%s': %s", input_buf, strparser (parser_status));
}
if (parser_status == PARSER_TOKEN_LENGTH)
{
hashes->parser_token_length_cnt++;
}
}
else
{
@ -1313,6 +1325,11 @@ int hashes_init_stage1 (hashcat_ctx_t *hashcat_ctx)
{
event_log_warning (hashcat_ctx, "Hash '%s': %s", input_buf, strparser (parser_status));
}
if (parser_status == PARSER_TOKEN_LENGTH)
{
hashes->parser_token_length_cnt++;
}
}
}
else
@ -1343,6 +1360,11 @@ int hashes_init_stage1 (hashcat_ctx_t *hashcat_ctx)
{
event_log_warning (hashcat_ctx, "Hash '%s': %s", input_buf, strparser (parser_status));
}
if (parser_status == PARSER_TOKEN_LENGTH)
{
hashes->parser_token_length_cnt++;
}
}
}
}
@ -1673,6 +1695,11 @@ int hashes_init_stage1 (hashcat_ctx_t *hashcat_ctx)
hcfree (tmp_line_buf);
if (parser_status == PARSER_TOKEN_LENGTH)
{
hashes->parser_token_length_cnt++;
}
continue;
}
@ -1699,6 +1726,11 @@ int hashes_init_stage1 (hashcat_ctx_t *hashcat_ctx)
hcfree (tmp_line_buf);
if (parser_status_postprocess == PARSER_TOKEN_LENGTH)
{
hashes->parser_token_length_cnt++;
}
continue;
}
}
@ -1808,6 +1840,11 @@ int hashes_init_stage1 (hashcat_ctx_t *hashcat_ctx)
{
event_log_warning (hashcat_ctx, "Hash '%s': %s", input_buf, strparser (parser_status));
}
if (parser_status == PARSER_TOKEN_LENGTH)
{
hashes->parser_token_length_cnt++;
}
}
}
}
@ -1857,6 +1894,16 @@ int hashes_init_stage1 (hashcat_ctx_t *hashcat_ctx)
}
}
if (hashes->parser_token_length_cnt > 0)
{
event_log_advice (hashcat_ctx, NULL); // we can guarantee that the previous line was not an empty line
event_log_advice (hashcat_ctx, "* Token length exception: %u/%u hashes", hashes->parser_token_length_cnt, hashes->parser_token_length_cnt + hashes->hashes_cnt_orig);
event_log_advice (hashcat_ctx, " This error happens if the wrong hash type is specified, if the hashes are");
event_log_advice (hashcat_ctx, " malformed, or if input is otherwise not as expected (for example, if the");
event_log_advice (hashcat_ctx, " --username option is used but no username is present)");
event_log_advice (hashcat_ctx, NULL);
}
return 0;
}