More aircrack 1.2 rc1 fixes

Airmon-ng works.
* Deletes conflicting processes on rc1, need to test on rc2 before
  adding to Wifite.py (main).

WPS PIN-attack *sort of* works for reaver 1.4. Needs a way to derive
    current pin count when restarting a session.
This commit is contained in:
derv82
2015-06-11 22:35:06 -07:00
parent 633d11b7d1
commit b79025f1dc
3 changed files with 71 additions and 3 deletions

View File

@@ -238,7 +238,8 @@ class AttackWPS(Attack):
# Reset failures on successful try
failures = 0
pins.add(pin)
pin_current = len(pins)
#pin_current = len(pins)
pin_current += 1
# Failures
if 'WPS transaction failed' in out:
@@ -271,6 +272,21 @@ class AttackWPS(Attack):
eta = match.groups()[0]
state = '{C}cracking, ETA: {G}%s{W}' % eta
match = re.search('Max time remaining at this rate: ([a-zA-Z0-9:]+)..([0-9]+) pins left to try', out)
if match:
eta = match.groups()[0]
state = '{C}cracking, ETA: {G}%s{W}' % eta
pins_left = match.groups()[1]
# TODO: Divine pin_current & pin_total from this:
# pin_current = 11000 - pins_left
# NOTE: Need to update set of "pins" to match pin_current
#while len(pins) < pin_current:
# set.add('unique string here')
#while pin_current < len(pins):
# set.remove('untried entry here')
# Check if process is still running
if reaver.pid.poll() != None:
Color.pl('{R}failed{W}')