alexandre/wifite2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't crack if --dict wordlist is not found (e.g. --dict none)

Browse Source 
Should probably be another option like --no-crack
This commit is contained in:
derv82
2017-05-16 19:16:58 -04:00
parent bcde906a77
commit 8621d422ac
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
py/AttackWPA.py
View File

@@ -141,7 +141,7 @@ class AttackWPA(Attack):
" wordlist {R}%s{O} was not found" % wordlist) " wordlist {R}%s{O} was not found" % wordlist)
return None return None
Color.pl("\n{+} {C}Cracking Handshake:{W} Using {C}aircrack-ng{W} via" + Color.pl("\n{+} {C}Cracking WPA Handshake:{W} Using {C}aircrack-ng{W} via" +
" {C}%s{W} wordlist" % os.path.split(wordlist)[-1]) " {C}%s{W} wordlist" % os.path.split(wordlist)[-1])
key_file = Configuration.temp('wpakey.txt') key_file = Configuration.temp('wpakey.txt')
@@ -178,7 +178,7 @@ class AttackWPA(Attack):
else: else:
continue continue
status = "\r{+} {C}Cracking Handshake: %0.2f%%{W}" % percent status = "\r{+} {C}Cracking WPA Handshake: %0.2f%%{W}" % percent
status += " ETA: {C}%s{W}" % eta_str status += " ETA: {C}%s{W}" % eta_str
status += " @ {C}%0.1fkps{W}" % num_kps status += " @ {C}%0.1fkps{W}" % num_kps
#status += " ({C}%d{W}/{C}%d{W} keys)" % (num_tried, num_total) #status += " ({C}%d{W}/{C}%d{W} keys)" % (num_tried, num_total)
@@ -194,7 +194,7 @@ class AttackWPA(Attack):
f.close() f.close()
os.remove(key_file) os.remove(key_file)
Color.pl("{+} {G}Cracked Handshake{W} PSK: {G}%s{W}\n" % key) Color.pl("{+} {G}Cracked WPA Handshake{W} PSK: {G}%s{W}\n" % key)
return key return key
else: else:
Color.pl("{!} {R}Failed to crack handshake:" + Color.pl("{!} {R}Failed to crack handshake:" +

3
py/Configuration.py
View File

@@ -169,7 +169,8 @@ class Configuration(object):
Configuration.wordlist = args.wordlist Configuration.wordlist = args.wordlist
Color.pl('{+} {C}option:{W} using wordlist {G}%s{W} to crack WPA handshakes' % args.wordlist) Color.pl('{+} {C}option:{W} using wordlist {G}%s{W} to crack WPA handshakes' % args.wordlist)
else: else:
Color.pl('{+} {C}option:{O} wordlist {R}%s{O} was not found, using {R}%s{W}' % (args.wordlist, Configuration.wordlist)) Configuration.wordlist = None
Color.pl('{+} {C}option:{O} wordlist {R}%s{O} was not found, wifite will NOT attempt to crack handshakes' % args.wordlist)
if args.wpa_deauth_timeout: if args.wpa_deauth_timeout:
Configuration.wpa_deauth_timeout = args.wpa_deauth_timeout Configuration.wpa_deauth_timeout = args.wpa_deauth_timeout
Color.pl('{+} {C}option:{W} will deauth WPA clients every {G}%d seconds{W}' % args.wpa_deauth_timeout) Color.pl('{+} {C}option:{W} will deauth WPA clients every {G}%d seconds{W}' % args.wpa_deauth_timeout)