arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2025-06-01 13:48:48 +00:00
Code Issues Releases Wiki Activity

Fix calculation of mask length for status view in case hex-charset is used

Browse Source
This commit is contained in:
Jens Steube 2019-10-09 19:18:18 +02:00
parent 2622993c00
commit c78b8878d5
3 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/mpsp.h
View File

@ -22,7 +22,7 @@
#define INCR_MASKS 1000 #define INCR_MASKS 1000
u32 mp_get_length (const char *mask); u32 mp_get_length (const char *mask, const u32 opts_type);
void sp_exec (u64 ctx, char *pw_buf, cs_t *root_css_buf, cs_t *markov_css_buf, u32 start, u32 stop); void sp_exec (u64 ctx, char *pw_buf, cs_t *root_css_buf, cs_t *markov_css_buf, u32 start, u32 stop);

25
src/mpsp.c
View File

@ -1061,7 +1061,7 @@ static int mask_append (hashcat_ctx_t *hashcat_ctx, const char *mask, const char
if (user_options->increment == true) if (user_options->increment == true)
{ {
const u32 mask_length = mp_get_length (mask); const u32 mask_length = mp_get_length (mask, hashconfig->opts_type);
u32 increment_min = user_options->increment_min; u32 increment_min = user_options->increment_min;
u32 increment_max = user_options->increment_max; u32 increment_max = user_options->increment_max;
@ -1129,18 +1129,35 @@ static int mask_append (hashcat_ctx_t *hashcat_ctx, const char *mask, const char
return 0; return 0;
} }
u32 mp_get_length (const char *mask) u32 mp_get_length (const char *mask, const u32 opts_type)
{ {
bool ignore_next = false;
u32 len = 0; u32 len = 0;
const size_t mask_len = strlen (mask); const size_t mask_len = strlen (mask);
for (size_t i = 0; i < mask_len; i++) for (size_t i = 0; i < mask_len; i++)
{ {
if (mask[i] == '?') i++; if (ignore_next == true)
{
ignore_next = false;
}
else
{
if (mask[i] == '?')
{
ignore_next = true;
}
if (opts_type & OPTS_TYPE_PT_HEX)
{
ignore_next = true;
}
len++; len++;
} }
}
return len; return len;
} }
@ -1260,7 +1277,7 @@ int mask_ctx_update_loop (hashcat_ctx_t *hashcat_ctx)
if (user_options->benchmark == true) if (user_options->benchmark == true)
{ {
pw_min = mp_get_length (mask_ctx->mask); pw_min = mp_get_length (mask_ctx->mask, hashconfig->opts_type);
pw_max = pw_min; pw_max = pw_min;
} }

3
src/status.c
View File

@ -778,13 +778,14 @@ char *status_get_guess_charset (const hashcat_ctx_t *hashcat_ctx)
int status_get_guess_mask_length (const hashcat_ctx_t *hashcat_ctx) int status_get_guess_mask_length (const hashcat_ctx_t *hashcat_ctx)
{ {
const hashconfig_t *hashconfig = hashcat_ctx->hashconfig;
const mask_ctx_t *mask_ctx = hashcat_ctx->mask_ctx; const mask_ctx_t *mask_ctx = hashcat_ctx->mask_ctx;
if (mask_ctx == NULL) return -1; if (mask_ctx == NULL) return -1;
if (mask_ctx->mask == NULL) return -1; if (mask_ctx->mask == NULL) return -1;
return mp_get_length (mask_ctx->mask); return mp_get_length (mask_ctx->mask, hashconfig->opts_type);
} }
char *status_get_guess_candidates_dev (const hashcat_ctx_t *hashcat_ctx, const int backend_devices_idx) char *status_get_guess_candidates_dev (const hashcat_ctx_t *hashcat_ctx, const int backend_devices_idx)