diff --git a/docs/changes.txt b/docs/changes.txt index c7eb61f2f..a99052e72 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -20,14 +20,15 @@ ## Bugs ## +- Fixed a memory problem that occured when the OpenCL folder was not found and e.g. the shared and session folder were the same - Fixed a parser error for mode -m 9820 = MS Office <= 2003 $3, SHA1 + RC4, collider #2 - Fixed a problem with changed current working directory, for instance by using --restore together with --remove -- Fixed a memory problem that occured when the OpenCL folder was not found and e.g. the shared and session folder were the same -- Fixed the version number used in the restore file header -- Fixed the parsing of command line options. It doesn't show two times the same error about an invalid option anymore. +- Fixed an invalid progress value in status view if words from the base wordlist get rejected because of length - Fixed the estimated time value whenever the value is very large and overflows +- Fixed the parsing of command line options. It doesn't show two times the same error about an invalid option anymore. - Fixed the parsing of DCC2 hashes by allowing the "#" character within the user name - Fixed the parsing of descrypt hashes if the hashes do have non-standard characters within the salt +- Fixed the version number used in the restore file header ## ## Improvements diff --git a/src/dispatch.c b/src/dispatch.c index ccf540f73..c3a36ad1b 100644 --- a/src/dispatch.c +++ b/src/dispatch.c @@ -563,7 +563,14 @@ static int calc (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param) for (u32 salt_pos = 0; salt_pos < hashes->salts_cnt; salt_pos++) { - status_ctx->words_progress_rejected[salt_pos] += words_extra_total * straight_ctx->kernel_rules_cnt; + if (attack_kern == ATTACK_KERN_STRAIGHT) + { + status_ctx->words_progress_rejected[salt_pos] += words_extra_total * straight_ctx->kernel_rules_cnt; + } + else if (attack_kern == ATTACK_KERN_COMBI) + { + status_ctx->words_progress_rejected[salt_pos] += words_extra_total * combinator_ctx->combs_cnt; + } } hc_thread_mutex_unlock (status_ctx->mux_counter);