Changed decode from ASCII to UTF-8

Author: ghostop14

sparrowbluetooth.py

@@ -387,7 +387,7 @@ def run(self):
             if not self.btMonRunning():
                 self.startBTMon()
 
-            curLine = self.btmonProc.stdout.readline().decode('ASCII').replace('\n', '')
+            curLine = self.btmonProc.stdout.readline().decode('UTF-8').replace('\n', '')
 
             # Address
             fieldValue = self.getFieldValue(p_address, curLine)
@@ -516,7 +516,7 @@ def run(self):
         rssi_offset = -54   # Note: This is direct from the Ubertooth bluetooth module.  I thought the RSSI's looked really high.
 
         while not specanProc.poll() and not self.signalStop:
-            dataline = specanProc.stdout.readline().decode('ASCII').replace('\n', '')
+            dataline = specanProc.stdout.readline().decode('UTF-8').replace('\n', '')
             dataline = dataline.replace(' ', '')
             data = dataline.split(',')
             if len(data) >= 3:
@@ -957,7 +957,7 @@ def getNumUbertoothDevices():
         if result.returncode != 0:
             return 0
 
-        hciResult = result.stdout.decode('ASCII')
+        hciResult = result.stdout.decode('UTF-8')
         p = re.compile('^.*(1d50)', re.MULTILINE)
         tmpInterfaces = p.findall(hciResult)
 
@@ -980,7 +980,7 @@ def getBluetoothInterfaces(printResults=False):
         if result.returncode != 0:
             return []
 
-        hciResult = result.stdout.decode('ASCII')
+        hciResult = result.stdout.decode('UTF-8')
         p = re.compile('^.*(hci[0-9])', re.MULTILINE)
         tmpInterfaces = p.findall(hciResult)
 
@@ -1003,7 +1003,7 @@ def getBluetoothInterfaces(printResults=False):
     def getUbertoothSpecanProcesses():
         # Returns a list of process id's
         result = subprocess.run(['pgrep', '-f','ubertooth-specan'], stdout=subprocess.PIPE,stderr=subprocess.DEVNULL)
-        testResult = result.stdout.decode('ASCII')
+        testResult = result.stdout.decode('UTF-8')
 
         retVal = []
         if result.returncode != 0:
@@ -1063,7 +1063,7 @@ def ubertoothOnline():
         params = ['ubertooth-util', '-v']
 
         result = subprocess.run(params, stdout=subprocess.PIPE,stderr=subprocess.PIPE)
-        testResult = result.stdout.decode('ASCII')
+        testResult = result.stdout.decode('UTF-8')
         if 'could not open Ubertooth device' in testResult:
             return -3, 'Unable to find Ubertooth device'
 

sparrowcommon.py

@@ -82,7 +82,7 @@ def gzipUncompress(inputBytes):
     with gzip.GzipFile(fileobj=inp, mode='rb') as ofile:
         gunzippedString = ofile.read()
 
-    return gunzippedString.decode('ASCII')
+    return gunzippedString.decode('UTF-8')
 
 # ------------------  Class Base Thread ----------------------------------
 class BaseThreadClass(Thread):

sparrowgps.py

@@ -214,7 +214,7 @@ def GPSDRunning():
         # ps.stdout.close()
         # ps.wait()
 
-        # gpsResult = output.decode('ASCII')
+        # gpsResult = output.decode('UTF-8')
 
         # if re.search('/gpsd', gpsResult) is None:
         #    return False

sparrowhackrf.py

@@ -90,7 +90,7 @@ def run(self):
         iteration = 0
 
         while not hackrfsweepProc.poll() and not self.signalStop:
-            dataline = hackrfsweepProc.stdout.readline().decode('ASCII').replace('\n', '')
+            dataline = hackrfsweepProc.stdout.readline().decode('UTF-8').replace('\n', '')
 
             dataline = dataline.replace(' ', '')
             data = dataline.split(',')
@@ -163,7 +163,7 @@ def getNumHackrfDevices():
         if result.returncode != 0:
             return 0
 
-        hciResult = result.stdout.decode('ASCII')
+        hciResult = result.stdout.decode('UTF-8')
         p = re.compile('^.*(1d50)', re.MULTILINE)
         tmpInterfaces = p.findall(hciResult)
 

sparrowwifiagent.py

@@ -177,7 +177,7 @@ def restartAgent():
     os.system(newCommand)
     # subprocess.Popen(params, stdout=subprocess.DEVNULL,stderr=subprocess.DEVNULL)
     # result = subprocess.run(params, stdout=subprocess.DEVNULL,stderr=subprocess.DEVNULL)
-    # restartResult = result.stdout.decode('ASCII')
+    # restartResult = result.stdout.decode('UTF-8')
     os.kill(os.getpid(), 9)
 
 def updateRunningConfig(newCfg):

wirelessengine.py

@@ -494,7 +494,7 @@ def convertUnknownToString(ssid):
 
     def getInterfaces(printResults=False):
         result = subprocess.run(['iwconfig'], stdout=subprocess.PIPE,stderr=subprocess.DEVNULL)
-        wirelessResult = result.stdout.decode('ASCII')
+        wirelessResult = result.stdout.decode('UTF-8')
         p = re.compile('^(.*?) IEEE', re.MULTILINE)
         tmpInterfaces = p.findall(wirelessResult)
 
@@ -518,7 +518,7 @@ def getMonitoringModeInterfaces(printResults=False):
         # Note: for standard scans with iw, this isn't required.  Just root access.
         # This is only required for some of the more advanced pen testing capabilities
         result = subprocess.run(['iwconfig'], stdout=subprocess.PIPE,stderr=subprocess.DEVNULL)
-        wirelessResult = result.stdout.decode('ASCII')
+        wirelessResult = result.stdout.decode('UTF-8')
         p = re.compile('^(.*?) IEEE.*?Mode:Monitor', re.MULTILINE)
         tmpInterfaces = p.findall(wirelessResult)
 
@@ -626,7 +626,7 @@ def scanForNetworks(interfaceName, frequency=0, printResults=False):
 
         retCode = result.returncode
         errString = ""
-        wirelessResult = result.stdout.decode('ASCII')
+        wirelessResult = result.stdout.decode('UTF-8')
 
         # debug
         if (printResults):