2.1.6: Support non-ASCII ESSIDs in scanner. Don't silently exit on crash.
Resolves #88 Resolves #92 Might be related to #85
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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()
|
||||
except Exception as e:
|
||||
break
|
||||
self.targets = airodump.get_targets()
|
||||
|
||||
if self.found_target():
|
||||
# We found the target we want
|
||||
|
||||
Reference in New Issue
Block a user