Ignore -1 channels, bug/crash fix, support newer tshark
This commit is contained in:
@@ -195,6 +195,10 @@ class Airodump(object):
|
|||||||
# Ignore empty/blank ESSIDs
|
# Ignore empty/blank ESSIDs
|
||||||
continue
|
continue
|
||||||
|
|
||||||
|
if target.channel == "-1":
|
||||||
|
# Ignore -1 channel
|
||||||
|
continue
|
||||||
|
|
||||||
targets.append(target)
|
targets.append(target)
|
||||||
return targets
|
return targets
|
||||||
|
|
||||||
|
|||||||
@@ -74,7 +74,7 @@ class Arguments(object):
|
|||||||
dest='wep_timeout',
|
dest='wep_timeout',
|
||||||
metavar='[seconds]',
|
metavar='[seconds]',
|
||||||
type=int,
|
type=int,
|
||||||
help=Color.s('Seconds to wait before failing (default: {G}%d ivs{W})')
|
help=Color.s('Seconds to wait before failing (default: {G}%d sec{W})')
|
||||||
% Configuration.wep_timeout)
|
% Configuration.wep_timeout)
|
||||||
wep.add_argument('-wepc',
|
wep.add_argument('-wepc',
|
||||||
action='store',
|
action='store',
|
||||||
|
|||||||
@@ -198,7 +198,7 @@ class AttackWPS(Attack):
|
|||||||
Configuration.wps_fail_threshold))
|
Configuration.wps_fail_threshold))
|
||||||
|
|
||||||
if failures >= Configuration.wps_fail_threshold:
|
if failures >= Configuration.wps_fail_threshold:
|
||||||
Color.pl('{R}failed: {O}too many failures{W}' % failures)
|
Color.pl('{R}failed: {O}too many failures{W}')
|
||||||
break
|
break
|
||||||
|
|
||||||
# Get output
|
# Get output
|
||||||
|
|||||||
@@ -120,7 +120,8 @@ class Handshake(object):
|
|||||||
'tshark',
|
'tshark',
|
||||||
'-r', self.capfile,
|
'-r', self.capfile,
|
||||||
'-R', 'eapol',
|
'-R', 'eapol',
|
||||||
'-n'
|
'-n',
|
||||||
|
'-2' # 2-pass filtering, required when using -R in newer versions of tshark
|
||||||
]
|
]
|
||||||
|
|
||||||
def tshark_handshakes(self):
|
def tshark_handshakes(self):
|
||||||
|
|||||||
Reference in New Issue
Block a user