From f1f0828b2816ae16ca302379cc39767313bc9be8 Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Mon, 21 Nov 2011 22:27:47 +0000 Subject: [PATCH] minor update --- lib/utils/hash.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/lib/utils/hash.py b/lib/utils/hash.py index fa05921fe..29ad0cffa 100644 --- a/lib/utils/hash.py +++ b/lib/utils/hash.py @@ -603,8 +603,15 @@ def dictionaryAttack(attack_dict): if not kb.wordlist: while not kb.wordlist: + + # the slowest of all methods hence smaller default dict + if hash_regex in (HASH.ORACLE_OLD, HASH.WORDPRESS): + dictPaths = [paths.SMALL_DICT] + else: + dictPaths = [paths.WORDLIST] + message = "what dictionary do you want to use?\n" - message += "[1] default dictionary file (press Enter)\n" + message += "[1] default dictionary file '%s' (press Enter)\n" % dictPaths[0] message += "[2] custom dictionary file\n" message += "[3] file with list of dictionary files" choice = readInput(message, default="1") @@ -623,12 +630,6 @@ def dictionaryAttack(attack_dict): logger.info("using custom list of dictionaries") else: - # It is the slowest of all methods hence smaller default dict - if hash_regex in (HASH.ORACLE_OLD, HASH.WORDPRESS): - dictPaths = [paths.SMALL_DICT] - else: - dictPaths = [paths.WORDLIST] - logger.info("using default dictionary") for dictPath in dictPaths: