2.1.6: Support non-ASCII ESSIDs in scanner. Don't silently exit on crash.

Resolves #88
Resolves #92
Might be related to #85

wifite/config.py

@@ -8,7 +8,7 @@ from .tools.macchanger import Macchanger
 
 class Configuration(object):
     ''' Stores configuration variables and functions for Wifite. '''
-    version = '2.1.5'
+    version = '2.1.6'
 
     initialized = False # Flag indicating config has been initialized
     temp_dir = None     # Temporary directory

wifite/tools/airodump.py

@@ -192,10 +192,9 @@ class Airodump(Dependency):
         '''Returns list of Target objects parsed from CSV file.'''
         targets = []
         import csv
-        with open(csv_filename, 'rb') as csvopen:
+        with open(csv_filename, 'r') as csvopen:
             lines = []
             for line in csvopen:
-                if type(line) is bytes: line = line.decode('utf-8')
                 line = line.replace('\0', '')
                 lines.append(line)
             csv_reader = csv.reader(lines,

wifite/util/scanner.py

@@ -39,10 +39,7 @@ class Scanner(object):
                         self.err_msg = '\r{!} {R}Airodump exited unexpectedly (Code: %d){O} Command: {W}%s' % (airodump.pid.poll(), " ".join(airodump.pid.command))
                         raise KeyboardInterrupt
 
-                    try:
+                    self.targets = airodump.get_targets()
-                        self.targets = airodump.get_targets()
-                    except Exception as e:
-                        break
 
                     if self.found_target():
                         # We found the target we want

wifite/wifite.py

@@ -55,9 +55,6 @@ class Wifite(object):
         from .tools.aireplay import Aireplay
         from .tools.ifconfig import Ifconfig
         from .tools.iwconfig import Iwconfig
-        from .tools.hostapd import Hostapd
-        from .tools.dnsmasq import Dnsmasq
-        from .tools.iptables import Iptables
         from .tools.bully import Bully
         from .tools.reaver import Reaver
         from .tools.wash import Wash
@@ -78,9 +75,6 @@ class Wifite(object):
                 Macchanger
             ]
 
-        if Configuration.use_eviltwin:
-            apps.extend([Hostapd, Dnsmasq, Iptables])
-
         missing_required = any([app.fails_dependency_check() for app in apps])
 
         if missing_required: