From c0b3f036059e1dd8dac1d60d6cab14cbde3f095b Mon Sep 17 00:00:00 2001 From: Chick3nman Date: Tue, 12 Mar 2019 12:53:44 -0500 Subject: [PATCH 1/3] Do not remove hashes if --keep-guessing enabled --- src/potfile.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/potfile.c b/src/potfile.c index a7d3db540..44ce90547 100644 --- a/src/potfile.c +++ b/src/potfile.c @@ -373,10 +373,13 @@ int potfile_remove_parse (hashcat_ctx_t *hashcat_ctx) const hashes_t *hashes = hashcat_ctx->hashes; const module_ctx_t *module_ctx = hashcat_ctx->module_ctx; const potfile_ctx_t *potfile_ctx = hashcat_ctx->potfile_ctx; + const user_options_t *user_options = hashcat_ctx->user_options; if (potfile_ctx->enabled == false) return 0; if (hashconfig->potfile_disable == true) return 0; + + if (user_options->keep_guessing == true) return 0; // if no potfile exists yet we don't need to do anything here From e8b81657d77dc12f99fd761abd6971ae3de5cf34 Mon Sep 17 00:00:00 2001 From: Chick3nman Date: Tue, 12 Mar 2019 13:32:31 -0500 Subject: [PATCH 2/3] Add warning message for --keep-guessing --- src/main.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main.c b/src/main.c index d189fdb65..73ead275b 100644 --- a/src/main.c +++ b/src/main.c @@ -519,7 +519,14 @@ static void main_outerloop_mainscreen (MAYBE_UNUSED hashcat_ctx_t *hashcat_ctx, event_log_advice (hashcat_ctx, NULL); } } - + + if (user_options->keep_guessing == true) + { + event_log_advice (hashcat_ctx, "ATTENTION! Keep-guessing is enabled."); + event_log_advice (hashcat_ctx, "This tells Hashcat to continue guessing against all target hashes until attack exhaustion."); + event_log_advice (hashcat_ctx, "Hashcat will NOT check for or remove targets present in the potfile and will add ALL plains/collisions found, including duplicates, to the potfile."); + event_log_advice (hashcat_ctx, NULL); + } /** * Watchdog and Temperature balance */ From 3c7d42079eed0b811feac1db653e5c85ba0a4da2 Mon Sep 17 00:00:00 2001 From: Chick3nman Date: Wed, 13 Mar 2019 09:17:02 -0500 Subject: [PATCH 3/3] Update catch for --keep-guessing to include auto-enabled kernels --- src/potfile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/potfile.c b/src/potfile.c index 44ce90547..c59238684 100644 --- a/src/potfile.c +++ b/src/potfile.c @@ -379,7 +379,7 @@ int potfile_remove_parse (hashcat_ctx_t *hashcat_ctx) if (hashconfig->potfile_disable == true) return 0; - if (user_options->keep_guessing == true) return 0; + if (hashconfig->opts_type & OPTS_TYPE_PT_NEVERCRACK) return 0; // if no potfile exists yet we don't need to do anything here