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

2.2.5: PMKID timeout changed to 30sec. --pmkid-timeout option to change.

Browse Source 
For #134
This commit is contained in:
derv82
2018-09-03 10:26:08 -07:00
parent 838ea43a73
commit 5e204686fa
3 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
wifite/args.py
View File

@@ -301,11 +301,13 @@ class Arguments(object):
wpa.add_argument('-pmkid', action='store_true', dest='use_pmkid_only', wpa.add_argument('-pmkid', action='store_true', dest='use_pmkid_only',
help=argparse.SUPPRESS) help=argparse.SUPPRESS)
wpa.add_argument('--new-hs', wpa.add_argument('--pmkid-timeout',
action='store_true', action='store',
dest='ignore_old_handshakes', dest='pmkid_timeout',
help=Color.s('Captures new handshakes, ignores existing handshakes ' + metavar='[sec]',
'in ./hs (default: {G}off{W})')) type=int,
help=self._verbose('Time to wait for PMKID capture ' +
'(default: {G}%d{W} seconds)' % self.config.pmkid_timeout))
wpa.add_argument('--hs-dir', wpa.add_argument('--hs-dir',
action='store', action='store',
@@ -317,6 +319,12 @@ class Arguments(object):
wpa.add_argument('-hs-dir', help=argparse.SUPPRESS, action='store', wpa.add_argument('-hs-dir', help=argparse.SUPPRESS, action='store',
dest='wpa_handshake_dir', type=str) dest='wpa_handshake_dir', type=str)
wpa.add_argument('--new-hs',
action='store_true',
dest='ignore_old_handshakes',
help=Color.s('Captures new handshakes, ignores existing handshakes ' +
'in {C}%s{W} (default: {G}off{W})' % self.config.wpa_handshake_dir))
wpa.add_argument('--dict', wpa.add_argument('--dict',
action='store', action='store',
dest='wordlist', dest='wordlist',

2
wifite/attack/pmkid.py
View File

@@ -108,7 +108,7 @@ class AttackPMKID(Attack):
The PMKID hash (str) if found, otherwise None. The PMKID hash (str) if found, otherwise None.
''' '''
self.keep_capturing = True self.keep_capturing = True
self.timer = Timer(15) self.timer = Timer(Configuration.pmkid_timeout)
# Start hcxdumptool # Start hcxdumptool
t = Thread(target=self.dumptool_thread) t = Thread(target=self.dumptool_thread)

7
wifite/config.py
View File

@@ -8,7 +8,7 @@ from .tools.macchanger import Macchanger
class Configuration(object): class Configuration(object):
''' Stores configuration variables and functions for Wifite. ''' ''' Stores configuration variables and functions for Wifite. '''
version = '2.2.4' version = '2.2.5'
initialized = False # Flag indicating config has been initialized initialized = False # Flag indicating config has been initialized
temp_dir = None # Temporary directory temp_dir = None # Temporary directory
@@ -79,6 +79,7 @@ class Configuration(object):
cls.wpa_strip_handshake = False # Strip non-handshake packets cls.wpa_strip_handshake = False # Strip non-handshake packets
cls.ignore_old_handshakes = False # Always fetch a new handshake cls.ignore_old_handshakes = False # Always fetch a new handshake
cls.use_pmkid_only = False # Only use PMKID Capture+Crack attack cls.use_pmkid_only = False # Only use PMKID Capture+Crack attack
cls.pmkid_timeout = 30 # Time to wait for PMKID capture
# Default dictionary for cracking # Default dictionary for cracking
cls.wordlist = None cls.wordlist = None
@@ -307,6 +308,10 @@ class Configuration(object):
cls.use_pmkid_only = True cls.use_pmkid_only = True
Color.pl('{+} {C}option:{W} will ONLY use {C}PMKID{W} attack on WPA networks') Color.pl('{+} {C}option:{W} will ONLY use {C}PMKID{W} attack on WPA networks')
if args.pmkid_timeout:
cls.pmkid_timeout = args.pmkid_timeout
Color.pl('{+} {C}option:{W} will wait {G}%d{W} seconds during {C}PMKID{W} capture')
if args.wpa_handshake_dir: if args.wpa_handshake_dir:
cls.wpa_handshake_dir = args.wpa_handshake_dir cls.wpa_handshake_dir = args.wpa_handshake_dir
Color.pl('{+} {C}option:{W} will store handshakes to ' + Color.pl('{+} {C}option:{W} will store handshakes to ' +