alexandre/wifite2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
Resolves #88
Resolves #92
Might be related to #85
This commit is contained in:
derv82
2018-06-09 22:20:29 -04:00
parent 96e846aa82
commit 1edba23c32
3 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wifite/config.py
View File

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

3
wifite/tools/airodump.py
View File

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

3
wifite/util/scanner.py
View File

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