]> git.ipfire.org Git - thirdparty/hostap.git/commitdiff
tests: Fix struct.unpack() call for a single octet with python3
authorJouni Malinen <j@w1.fi>
Sun, 3 Feb 2019 23:46:32 +0000 (01:46 +0200)
committerJouni Malinen <j@w1.fi>
Mon, 4 Feb 2019 10:26:34 +0000 (12:26 +0200)
python3 needs this to be a bytes object, not the first octet of that
object.

Signed-off-by: Jouni Malinen <j@w1.fi>
tests/hwsim/test_ap_wps.py

index a4d3b1ec7696bb402c9af8857a68676dd3f390d6..98597f1edcc3d13e160b9c22d2c626c01499944a 100644 (file)
@@ -6179,7 +6179,7 @@ def get_wsc_msg(dev):
     # Parse EAP expanded header
     if len(data) < 1:
         raise Exception("No EAP type included")
-    msg['eap_type'], = struct.unpack('B', data[0])
+    msg['eap_type'], = struct.unpack('B', data[0:1])
     data = data[1:]
 
     if msg['eap_type'] == 254:
@@ -6324,7 +6324,7 @@ def decrypt_attr_encr_settings(authkey, keywrapkey, data):
     encr = data[16:]
     aes = AES.new(keywrapkey, AES.MODE_CBC, iv)
     decrypted = aes.decrypt(encr)
-    pad_len, = struct.unpack('B', decrypted[-1])
+    pad_len, = struct.unpack('B', decrypted[-1:])
     if pad_len > len(decrypted):
         raise Exception("Invalid padding in Encrypted Settings")
     for i in range(-pad_len, -1):