Fix configuration/argument for wps rate limits

Also made WPS PIN attack prettier
This commit is contained in:
derv82
2015-06-07 16:37:10 -07:00
parent 337bed23c6
commit 920970f4e7
2 changed files with 6 additions and 6 deletions

View File

@@ -190,8 +190,8 @@ class AttackWPS(Attack):
time.sleep(1) time.sleep(1)
Color.clear_line() Color.clear_line()
Color.p('\r{+} {C}WPS PIN attack{W} ') Color.p('\r{+} {C}WPS PIN attack{W} ')
Color.p('({G}%d{W}/{G}%d{W}, ' % (pin_current, pin_total)) Color.p('({G}%d{W}/{G}%d pins{W}, ' % (pin_current, pin_total))
Color.p('{R}%d/%d failed{W}) ' % (failures, \ Color.p('{R}%d/%d failures{W}) ' % (failures, \
Configuration.wps_fail_threshold)) Configuration.wps_fail_threshold))
# Get output # Get output

View File

@@ -72,7 +72,7 @@ class Configuration(object):
Configuration.wps_max_retries = 20 # Retries before failing Configuration.wps_max_retries = 20 # Retries before failing
Configuration.wps_fail_threshold = 30 # Max number of failures Configuration.wps_fail_threshold = 30 # Max number of failures
Configuration.wps_timeout_threshold = 30 # Max number of timeouts Configuration.wps_timeout_threshold = 30 # Max number of timeouts
Configuration.wps_skip_rate_limit = False # Skip rate-limited WPS APs Configuration.wps_skip_rate_limit = True # Skip rate-limited WPS APs
# Commands # Commands
Configuration.show_cracked = False Configuration.show_cracked = False
@@ -184,9 +184,9 @@ class Configuration(object):
if args.wps_timeout_threshold: if args.wps_timeout_threshold:
Configuration.wps_timeout_threshold = args.wps_timeout_threshold Configuration.wps_timeout_threshold = args.wps_timeout_threshold
Color.pl('{+} {C}option:{W} will stop WPS attack after {G}%d timeouts{W}' % args.wps_timeout_threshold) Color.pl('{+} {C}option:{W} will stop WPS attack after {G}%d timeouts{W}' % args.wps_timeout_threshold)
if args.wps_ignore_rate_limit: if args.wps_ignore_rate_limit == False:
Configuration.wps_skip_rate_limit = True Configuration.wps_skip_rate_limit = False
Color.pl('{+} {C}option:{W} will {G}NOT{W} ignore WPS rate limits') Color.pl('{+} {C}option:{W} will {G}continue{W} WPS attacks when rate-limited')
# Adjust encryption filter # Adjust encryption filter
Configuration.encryption_filter = [] Configuration.encryption_filter = []