From 57195b475ae82387d085b2e49e5bff78de3087b6 Mon Sep 17 00:00:00 2001 From: jsteube Date: Mon, 19 Sep 2016 16:09:28 +0200 Subject: [PATCH] Fix missing prompt when using default mask --- src/hashcat.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/hashcat.c b/src/hashcat.c index 3458d5bda..5499bf2bc 100644 --- a/src/hashcat.c +++ b/src/hashcat.c @@ -1786,6 +1786,11 @@ int main (int argc, char **argv) uint wordlist_mode = ((optind + 1) < myargc) ? WL_MODE_FILE : WL_MODE_STDIN; + if (attack_mode == ATTACK_MODE_BF) + { + wordlist_mode = WL_MODE_MASK; + } + data.wordlist_mode = wordlist_mode; if (wordlist_mode == WL_MODE_STDIN) @@ -3430,15 +3435,11 @@ int main (int argc, char **argv) mp_setup_usr (mp_sys, mp_usr, custom_charset_2, 1, hashconfig); mp_setup_usr (mp_sys, mp_usr, custom_charset_3, 2, hashconfig); - masks[maskcnt] = mystrdup ("?1?2?2?2?2?2?2?3?3?3?3?d?d?d?d"); + maskcnt = 1; - wordlist_mode = WL_MODE_MASK; - - data.wordlist_mode = wordlist_mode; + masks[maskcnt - 1] = mystrdup ("?1?2?2?2?2?2?2?3?3?3?3?d?d?d?d"); increment = 1; - - maskcnt = 1; } } else @@ -3458,10 +3459,6 @@ int main (int argc, char **argv) masks[maskcnt - 1] = mystrdup (mask); - wordlist_mode = WL_MODE_MASK; - - data.wordlist_mode = wordlist_mode; - increment = 1; }