1
0
mirror of https://github.com/hashcat/hashcat.git synced 2024-11-21 23:58:07 +00:00

Merge pull request #3863 from PenguinKeeper7/dictstat-never-created

Correctly check -j and -k when creating dictstat
This commit is contained in:
Jens Steube 2023-09-09 21:04:32 +02:00 committed by GitHub
commit ce7e3b2483
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 6 deletions

View File

@ -2316,6 +2316,8 @@ typedef struct user_options
bool limit_chgd;
bool scrypt_tmto_chgd;
bool separator_chgd;
bool rule_buf_l_chgd;
bool rule_buf_r_chgd;
bool advice_disable;
bool benchmark;

View File

@ -100,8 +100,8 @@ void dictstat_read (hashcat_ctx_t *hashcat_ctx)
if (hashconfig->dictstat_disable == true) return;
if (user_options->rule_buf_l != NULL) return;
if (user_options->rule_buf_r != NULL) return;
if (user_options->rule_buf_l_chgd == true) return;
if (user_options->rule_buf_r_chgd == true) return;
HCFILE fp;
@ -192,8 +192,8 @@ int dictstat_write (hashcat_ctx_t *hashcat_ctx)
if (hashconfig->dictstat_disable == true) return 0;
if (user_options->rule_buf_l != NULL) return 0;
if (user_options->rule_buf_r != NULL) return 0;
if (user_options->rule_buf_l_chgd == true) return 0;
if (user_options->rule_buf_r_chgd == true) return 0;
HCFILE fp;

View File

@ -450,8 +450,10 @@ int user_options_getopt (hashcat_ctx_t *hashcat_ctx, int argc, char **argv)
case IDX_RP_GEN_FUNC_SEL: user_options->rp_gen_func_sel = optarg; break;
case IDX_RP_GEN_SEED: user_options->rp_gen_seed = hc_strtoul (optarg, NULL, 10);
user_options->rp_gen_seed_chgd = true; break;
case IDX_RULE_BUF_L: user_options->rule_buf_l = optarg; break;
case IDX_RULE_BUF_R: user_options->rule_buf_r = optarg; break;
case IDX_RULE_BUF_L: user_options->rule_buf_l = optarg;
user_options->rule_buf_l_chgd = true; break;
case IDX_RULE_BUF_R: user_options->rule_buf_r = optarg;
user_options->rule_buf_r_chgd = true; break;
case IDX_MARKOV_DISABLE: user_options->markov_disable = true; break;
case IDX_MARKOV_CLASSIC: user_options->markov_classic = true; break;
case IDX_MARKOV_INVERSE: user_options->markov_inverse = true; break;