From: Jouni Malinen Date: Sun, 3 Feb 2019 23:46:32 +0000 (+0200) Subject: tests: Fix struct.unpack() call for a single octet with python3 X-Git-Tag: hostap_2_8~448 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=786ce912ce3f2892d15e89a722a4b4dcc499ca00;p=thirdparty%2Fhostap.git tests: Fix struct.unpack() call for a single octet with python3 python3 needs this to be a bytes object, not the first octet of that object. Signed-off-by: Jouni Malinen --- diff --git a/tests/hwsim/test_ap_wps.py b/tests/hwsim/test_ap_wps.py index a4d3b1ec7..98597f1ed 100644 --- a/tests/hwsim/test_ap_wps.py +++ b/tests/hwsim/test_ap_wps.py @@ -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):