]> git.ipfire.org Git - thirdparty/hostap.git/commitdiff
tests: Extend build_wsc_attr() to accept both bytes and str objects
authorJouni Malinen <j@w1.fi>
Sun, 3 Feb 2019 23:48:43 +0000 (01:48 +0200)
committerJouni Malinen <j@w1.fi>
Mon, 4 Feb 2019 10:26:34 +0000 (12:26 +0200)
This is needed for python3.

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

index 98597f1edcc3d13e160b9c22d2c626c01499944a..970a8c2032558bf1286fcd7aa82db7532f8ff697 100644 (file)
@@ -6227,7 +6227,8 @@ def recv_wsc_msg(dev, opcode, msg_type):
     return msg, msg['wsc_attrs'], msg['raw_attrs']
 
 def build_wsc_attr(attr, payload):
-    return struct.pack('>HH', attr, len(payload)) + payload
+    _payload = payload if type(payload) == bytes else payload.encode()
+    return struct.pack('>HH', attr, len(_payload)) + _payload
 
 def build_attr_msg_type(msg_type):
     return build_wsc_attr(ATTR_MSG_TYPE, struct.pack('B', msg_type))