From 1edba23c3280a1a5f02f9cac42f3d5512063b0d7 Mon Sep 17 00:00:00 2001 From: derv82 Date: Sat, 9 Jun 2018 22:20:29 -0400 Subject: [PATCH] 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 | 2 +- wifite/tools/airodump.py | 3 +-- wifite/util/scanner.py | 5 +---- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/wifite/config.py b/wifite/config.py index 8bbf62a75..e1a40fc79 100755 --- a/wifite/config.py +++ b/wifite/config.py @@ -8,7 +8,7 @@ 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 diff --git a/wifite/tools/airodump.py b/wifite/tools/airodump.py index e00acbcdb..ebd33a9cf 100755 --- a/wifite/tools/airodump.py +++ b/wifite/tools/airodump.py @@ -192,10 +192,9 @@ def get_targets_from_csv(csv_filename): '''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, diff --git a/wifite/util/scanner.py b/wifite/util/scanner.py index ae45049a7..cd443dc0f 100755 --- a/wifite/util/scanner.py +++ b/wifite/util/scanner.py @@ -39,10 +39,7 @@ def __init__(self): 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