BUGFIX: Detect when Reaver/Bully is successful.
Reported in #60 Also removed PIN attack.
This commit is contained in:
@@ -25,11 +25,12 @@ class AttackWPS(Attack):
|
|||||||
# Pixie-Dust attack
|
# Pixie-Dust attack
|
||||||
if Configuration.use_bully:
|
if Configuration.use_bully:
|
||||||
# Bully: Pixie-dust
|
# Bully: Pixie-dust
|
||||||
bully = Bully(self.target, pixie=True)
|
bully = Bully(self.target)
|
||||||
bully.run()
|
bully.run()
|
||||||
bully.stop()
|
bully.stop()
|
||||||
if bully.crack_result is not None:
|
if bully.crack_result is not None:
|
||||||
self.crack_result = bully.crack_result
|
self.crack_result = bully.crack_result
|
||||||
|
self.success = True
|
||||||
return True
|
return True
|
||||||
else:
|
else:
|
||||||
reaver = Reaver(self.target)
|
reaver = Reaver(self.target)
|
||||||
@@ -37,6 +38,7 @@ class AttackWPS(Attack):
|
|||||||
# Reaver: Pixie-dust
|
# Reaver: Pixie-dust
|
||||||
reaver = Reaver(self.target)
|
reaver = Reaver(self.target)
|
||||||
if reaver.run_pixiedust_attack():
|
if reaver.run_pixiedust_attack():
|
||||||
|
self.success = True
|
||||||
return True
|
return True
|
||||||
else:
|
else:
|
||||||
Color.pl("{!} {R}your version of 'reaver' does not support the {O}WPS pixie-dust attack{W}")
|
Color.pl("{!} {R}your version of 'reaver' does not support the {O}WPS pixie-dust attack{W}")
|
||||||
@@ -45,20 +47,4 @@ class AttackWPS(Attack):
|
|||||||
Color.pl('\r{!} {O}--pixie{R} set, ignoring WPS-PIN attack{W}')
|
Color.pl('\r{!} {O}--pixie{R} set, ignoring WPS-PIN attack{W}')
|
||||||
return False
|
return False
|
||||||
|
|
||||||
###################
|
|
||||||
# PIN attack
|
|
||||||
if Configuration.use_bully:
|
|
||||||
# Bully: PIN guessing
|
|
||||||
bully = Bully(self.target, pixie=False)
|
|
||||||
bully.run()
|
|
||||||
bully.stop()
|
|
||||||
if bully.crack_result is not None:
|
|
||||||
self.crack_result = bully.crack_result
|
|
||||||
return True
|
|
||||||
else:
|
|
||||||
# Reaver: PIN guessing
|
|
||||||
reaver = Reaver(self.target)
|
|
||||||
if reaver.run_wps_pin_attack():
|
|
||||||
return True
|
|
||||||
|
|
||||||
return False
|
return False
|
||||||
|
|||||||
Reference in New Issue
Block a user