tests: Modify ocv test sets for python3
Signed-off-by: Masashi Honma <masashi.honma@gmail.com>
This commit is contained in:
parent
255f3846a9
commit
26b91346b9
1 changed files with 3 additions and 3 deletions
|
@ -22,7 +22,7 @@ from test_ap_psk import parse_eapol, build_eapol, pmk_to_ptk, eapol_key_mic, rec
|
||||||
|
|
||||||
def make_ocikde(op_class, channel, seg1_idx):
|
def make_ocikde(op_class, channel, seg1_idx):
|
||||||
WLAN_EID_VENDOR_SPECIFIC = 221
|
WLAN_EID_VENDOR_SPECIFIC = 221
|
||||||
RSN_KEY_DATA_OCI = "\x00\x0f\xac\x0d"
|
RSN_KEY_DATA_OCI = b"\x00\x0f\xac\x0d"
|
||||||
|
|
||||||
data = RSN_KEY_DATA_OCI + struct.pack("<BBB", op_class, channel, seg1_idx)
|
data = RSN_KEY_DATA_OCI + struct.pack("<BBB", op_class, channel, seg1_idx)
|
||||||
ocikde = struct.pack("<BB", WLAN_EID_VENDOR_SPECIFIC, len(data)) + data
|
ocikde = struct.pack("<BB", WLAN_EID_VENDOR_SPECIFIC, len(data)) + data
|
||||||
|
@ -403,7 +403,7 @@ class APConnection:
|
||||||
def test_bad_oci(self, logmsg, op_class, channel, seg1_idx):
|
def test_bad_oci(self, logmsg, op_class, channel, seg1_idx):
|
||||||
logger.debug("Bad OCI element: " + logmsg)
|
logger.debug("Bad OCI element: " + logmsg)
|
||||||
if op_class is None:
|
if op_class is None:
|
||||||
ocikde = ""
|
ocikde = b''
|
||||||
else:
|
else:
|
||||||
ocikde = make_ocikde(op_class, channel, seg1_idx)
|
ocikde = make_ocikde(op_class, channel, seg1_idx)
|
||||||
|
|
||||||
|
@ -768,7 +768,7 @@ class STAConnection:
|
||||||
def test_bad_oci(self, logmsg, op_class, channel, seg1_idx, errmsg):
|
def test_bad_oci(self, logmsg, op_class, channel, seg1_idx, errmsg):
|
||||||
logger.info("Bad OCI element: " + logmsg)
|
logger.info("Bad OCI element: " + logmsg)
|
||||||
if op_class is None:
|
if op_class is None:
|
||||||
ocikde = ""
|
ocikde = b''
|
||||||
else:
|
else:
|
||||||
ocikde = make_ocikde(op_class, channel, seg1_idx)
|
ocikde = make_ocikde(op_class, channel, seg1_idx)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue