1
0
mirror of https://github.com/hashcat/hashcat.git synced 2024-11-15 12:29:35 +00:00

Merge pull request #2101 from matrix/issue_2084

Fix #2084: bug with -S -O arguments set together
This commit is contained in:
Jens Steube 2019-07-29 14:41:57 +02:00 committed by GitHub
commit fbf787bd73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1297,13 +1297,16 @@ int mask_ctx_update_loop (hashcat_ctx_t *hashcat_ctx)
return -1;
}
if (hashconfig->opts_type & OPTS_TYPE_PT_UTF16LE)
if (user_options->slow_candidates == false)
{
if (mp_css_utf16le_expand (hashcat_ctx) == -1) return -1;
}
else if (hashconfig->opts_type & OPTS_TYPE_PT_UTF16BE)
{
if (mp_css_utf16be_expand (hashcat_ctx) == -1) return -1;
if (hashconfig->opts_type & OPTS_TYPE_PT_UTF16LE)
{
if (mp_css_utf16le_expand (hashcat_ctx) == -1) return -1;
}
else if (hashconfig->opts_type & OPTS_TYPE_PT_UTF16BE)
{
if (mp_css_utf16be_expand (hashcat_ctx) == -1) return -1;
}
}
u32 css_cnt_orig = mask_ctx->css_cnt;