From d5d09df75c72d9d6a58d4121c918c08bc41c7593 Mon Sep 17 00:00:00 2001 From: Jens Steube Date: Sat, 27 Nov 2021 09:14:03 +0100 Subject: [PATCH] Association Attack: Enable module specific pw_min and pw_max settings to avoid false positives in -a 9 attack-mode --- docs/changes.txt | 1 + src/interface.c | 12 ++---------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/docs/changes.txt b/docs/changes.txt index f04032f9e..78f3e225b 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -4,6 +4,7 @@ ## Technical ## +- Association Attack: Enable module specific pw_min and pw_max settings to avoid false positives in -a 9 attack-mode - Usage Screen: On windows console, wait for any keypress if usage_mini_print() is used * changes v6.2.4 -> v6.2.5 diff --git a/src/interface.c b/src/interface.c index d81b4ec97..49fe712e7 100644 --- a/src/interface.c +++ b/src/interface.c @@ -438,16 +438,8 @@ int hashconfig_init (hashcat_ctx_t *hashcat_ctx) hashconfig->kernel_threads_min = default_kernel_threads_min (hashconfig, user_options, user_options_extra); hashconfig->kernel_threads_max = default_kernel_threads_max (hashconfig, user_options, user_options_extra); - if (user_options->attack_mode == ATTACK_MODE_ASSOCIATION) - { - // we can't reject password candidates based on plugin specific password length boundaries, because they are not checked inside count_words() - } - else - { - if (module_ctx->module_pw_max != MODULE_DEFAULT) hashconfig->pw_max = module_ctx->module_pw_max (hashconfig, user_options, user_options_extra); - if (module_ctx->module_pw_min != MODULE_DEFAULT) hashconfig->pw_min = module_ctx->module_pw_min (hashconfig, user_options, user_options_extra); - } - + if (module_ctx->module_pw_max != MODULE_DEFAULT) hashconfig->pw_max = module_ctx->module_pw_max (hashconfig, user_options, user_options_extra); + if (module_ctx->module_pw_min != MODULE_DEFAULT) hashconfig->pw_min = module_ctx->module_pw_min (hashconfig, user_options, user_options_extra); if (module_ctx->module_salt_max != MODULE_DEFAULT) hashconfig->salt_max = module_ctx->module_salt_max (hashconfig, user_options, user_options_extra); if (module_ctx->module_salt_min != MODULE_DEFAULT) hashconfig->salt_min = module_ctx->module_salt_min (hashconfig, user_options, user_options_extra); if (module_ctx->module_kernel_accel_min != MODULE_DEFAULT) hashconfig->kernel_accel_min = module_ctx->module_kernel_accel_min (hashconfig, user_options, user_options_extra);