Merged WPS commit

wifite/model/target.py

@@ -137,10 +137,9 @@ def to_str(self, show_bssid=False):
             color = 'R'
         power = Color.s('{%s}%s' % (color, power))
 
-        wps = Color.s('{O} n/a')
-        if self.wps:
+        if self.wps == WPSState.UNLOCKED:
             wps = Color.s('{G} yes')
-        elif not self.wps:
+        elif self.wps == WPSState.NONE:
             wps = Color.s('{O}  no')
         elif self.wps == WPSState.LOCKED:
             wps = Color.s('{R}lock')

wifite/tools/airodump.py

@@ -17,8 +17,9 @@ class Airodump(Dependency):
     dependency_name = 'airodump-ng'
     dependency_url = 'https://www.aircrack-ng.org/install.html'
 
-    def __init__(self, interface=None, channel=None, encryption=None,
-                       wps=False, target_bssid=None, output_file_prefix='airodump',
+    def __init__(self, interface=None, channel=None, encryption=None,\
+                       wps=WPSState.UNKNOWN, target_bssid=None,
+                       output_file_prefix='airodump',\
                        ivs_only=False, skip_wps=False, delete_existing_files=True):
         '''Sets up airodump arguments, doesn't start process yet.'''