From b1a460ade226bd64cc33f2460cb6b18b24c593dd Mon Sep 17 00:00:00 2001 From: Jens Steube Date: Wed, 7 Nov 2018 14:20:40 +0100 Subject: [PATCH] Fixed status output of progress value in case -S and -l used in combination --- docs/changes.txt | 1 + src/status.c | 26 ++++++++++++++++++++------ 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/docs/changes.txt b/docs/changes.txt index 0790dcba1..8eb606570 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -31,6 +31,7 @@ ## Bugs ## +- Fixed status output of progress value in case -S and -l used in combination - Fixed calculation of brain-attack if a given wordlist has the size zero - Fixed automated calculation of brain-session when not using all hashes in the hashlist - Fixed endianness and invalid separator character in outfile format for hash-mode 16801 (WPA-PMKID-PMK) diff --git a/src/status.c b/src/status.c index d2a350295..b05f07cd4 100644 --- a/src/status.c +++ b/src/status.c @@ -1351,9 +1351,16 @@ u64 status_get_progress_end (const hashcat_ctx_t *hashcat_ctx) progress_end = MIN (user_options->limit, status_ctx->words_base) * hashes->salts_cnt; - if (user_options_extra->attack_kern == ATTACK_KERN_STRAIGHT) progress_end *= straight_ctx->kernel_rules_cnt; - else if (user_options_extra->attack_kern == ATTACK_KERN_COMBI) progress_end *= combinator_ctx->combs_cnt; - else if (user_options_extra->attack_kern == ATTACK_KERN_BF) progress_end *= mask_ctx->bfs_cnt; + if (user_options->slow_candidates == true) + { + // nothing to do + } + else + { + if (user_options_extra->attack_kern == ATTACK_KERN_STRAIGHT) progress_end *= straight_ctx->kernel_rules_cnt; + else if (user_options_extra->attack_kern == ATTACK_KERN_COMBI) progress_end *= combinator_ctx->combs_cnt; + else if (user_options_extra->attack_kern == ATTACK_KERN_BF) progress_end *= mask_ctx->bfs_cnt; + } } return progress_end; @@ -1376,9 +1383,16 @@ u64 status_get_progress_skip (const hashcat_ctx_t *hashcat_ctx) progress_skip = MIN (user_options->skip, status_ctx->words_base) * hashes->salts_cnt; - if (user_options_extra->attack_kern == ATTACK_KERN_STRAIGHT) progress_skip *= straight_ctx->kernel_rules_cnt; - else if (user_options_extra->attack_kern == ATTACK_KERN_COMBI) progress_skip *= combinator_ctx->combs_cnt; - else if (user_options_extra->attack_kern == ATTACK_KERN_BF) progress_skip *= mask_ctx->bfs_cnt; + if (user_options->slow_candidates == true) + { + // nothing to do + } + else + { + if (user_options_extra->attack_kern == ATTACK_KERN_STRAIGHT) progress_skip *= straight_ctx->kernel_rules_cnt; + else if (user_options_extra->attack_kern == ATTACK_KERN_COMBI) progress_skip *= combinator_ctx->combs_cnt; + else if (user_options_extra->attack_kern == ATTACK_KERN_BF) progress_skip *= mask_ctx->bfs_cnt; + } } return progress_skip;