From patchwork Thu Jan 31 08:15:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masashi Honma X-Patchwork-Id: 1034016 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="i0PNJ6HW"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="gCIQnTSn"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43qtTK1Rmxz9sBb for ; Thu, 31 Jan 2019 19:20:21 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=Wi9+nAlJlcp/LTb0dlXUCzbhJBqABAF3z0FaRROactI=; b=i0PNJ6HWhTC7IUv6QhMYBPuPyl ncKHiQ7RV9nx8g2s4PKMBtDl/0gh74uBEqDD+VpYnoeCJiyaOy+QGvYbiqniyYDjOqsVuNKxxLNVl GJe0pLu8QZbCCTQso8eNCXQPhBKwsBFWhUWlSguRCNXIeqRFpiRzhxhRCqkWeSQVRNc4CF0kOV2KJ aFt3BRTdHnVJdr29Sh2oPt4tHUpykaYCKbGwiCb7lG81A0UpivFuc+OySV4cbv/WBBCslrO5arJJa 7PcH/1ofp451fmbj1oSA4lMLye4iX42Nd40jk0OQDEQREaNp8eKcQGouVyrggrPnSv4W5xTpGE/i8 NSCtqIog==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gp7Zy-0007l2-P1; Thu, 31 Jan 2019 08:20:10 +0000 Received: from mail-pg1-x52f.google.com ([2607:f8b0:4864:20::52f]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gp7X5-0004Yl-Jx for hostap@lists.infradead.org; Thu, 31 Jan 2019 08:18:12 +0000 Received: by mail-pg1-x52f.google.com with SMTP id y4so1034572pgc.12 for ; Thu, 31 Jan 2019 00:17:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=MMcaCuciqKkBjVFNfky5Vd1hYUsNH9/w3Rl8w4VaMhI=; b=gCIQnTSnf4OIZaB7QdbIyXEOUloCnypBXiUffq4ukiRqjt60eBKWMSuO3GRn0VH1XT l+WBh88s1avqWL+yg0ue3F08mVPwKpGvofAAj8pi0aRZQPe5kMpQV8u4iOXRtpxf8JOk bSBfMebb1AaOv3Mew2ocI0R5nNeqC+yxWojFkhjK98WJx+Sdc77aVaCikwR6z+vhbLZ+ zC9ul9G50Rza0vJWbcrU0ZS5hDBnqNzUNZwK6f5skiiL2ULxLWt6neNoDWz/ZNE3VRzk TC4Jup+GpeokhWb5s2z2qQHXIlUN9teD272MWjM0Tl/ZOm7OJChA1B1gJKHb2CgdgSEQ 5Jlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=MMcaCuciqKkBjVFNfky5Vd1hYUsNH9/w3Rl8w4VaMhI=; b=iYFwJwIs96rQju7NQp5fyznJxCYn1fpyFMBQRzmjpv3696yo8qwmYuGHJ1OlzvzkHE kDZYhsccsjEfbNu6aFZh3x4nPYCLQKAm0G0+JEGbbsGsYi1Sp0JM9PUekxRIhBfZQCk9 612FkuHsNEihKB5i9rMyYBLn8GRm1z9P5tyCUg1qQJUVjI/cPaMni8pZityQM9DwA+iB tfEdrx3d+mj5R9IcYo8Ght9O812mL3BFgObiSrlgXL4LvV5rKbINK9BJb5x56I7fwfI5 XCN1ELMV4iAfqBSCgDC0ytRJEX/TMAisU2Dqt8s5RgkANrhomtwe4GUk2GJ228DwmzQX 1C5A== X-Gm-Message-State: AJcUukdabGEKsIxu53mrxlOyHVPDUI7uwKcG1R+sQC3E9dxlpIKW/one o9l/Un/bytPlOv2hQS5fuaFwCK8U X-Google-Smtp-Source: ALg8bN7I14JbvzidBNBmAGcBU0jDcmN8b2cwVeg+tTfU5Rgy6DWfAyqWiNGFqNYSE6AH3g0mY7TcrQ== X-Received: by 2002:a63:5252:: with SMTP id s18mr30459775pgl.326.1548922629272; Thu, 31 Jan 2019 00:17:09 -0800 (PST) Received: from gtx740.flets-east.jp ([2409:11:321:2100:78:f8b9:a649:4ae4]) by smtp.gmail.com with ESMTPSA id u137sm5495185pfc.140.2019.01.31.00.17.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Jan 2019 00:17:08 -0800 (PST) From: Masashi Honma To: hostap@lists.infradead.org Subject: [PATCH v2 17/38] tests: Modify fils test sets for python3 Date: Thu, 31 Jan 2019 17:15:56 +0900 Message-Id: <20190131081617.5005-18-masashi.honma@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190131081617.5005-1-masashi.honma@gmail.com> References: <20190131081617.5005-1-masashi.honma@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190131_001712_616073_312D25D4 X-CRM114-Status: GOOD ( 10.50 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:52f listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (masashi.honma[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Masashi Honma MIME-Version: 1.0 Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Signed-off-by: Masashi Honma --- tests/hwsim/test_fils.py | 138 +++++++++++++++++++-------------------- 1 file changed, 69 insertions(+), 69 deletions(-) diff --git a/tests/hwsim/test_fils.py b/tests/hwsim/test_fils.py index f4c5af2a9..bec855160 100644 --- a/tests/hwsim/test_fils.py +++ b/tests/hwsim/test_fils.py @@ -600,25 +600,25 @@ def test_fils_sk_multiple_realms(dev, apdev, params): if 'fils_realms' not in bss: raise Exception("FILS Realm Identifiers missing") - expected = '' + expected = bytes() count = 0 for realm in fils_realms: - hash = hashlib.sha256(realm.lower()).digest() + hash = hashlib.sha256(realm.lower().encode()).digest() expected += binascii.hexlify(hash[0:2]) count += 1 if count == 7: break - if bss['fils_realms'] != expected: + if bss['fils_realms'].encode() != expected: raise Exception("Unexpected FILS Realm Identifiers: " + bss['fils_realms']) if 'anqp_fils_realm_info' not in bss: raise Exception("FILS Realm Information ANQP-element not seen") - info = bss['anqp_fils_realm_info']; - expected = '' + info = bss['anqp_fils_realm_info'] + expected = bytes() for realm in fils_realms: - hash = hashlib.sha256(realm.lower()).digest() + hash = hashlib.sha256(realm.lower().encode()).digest() expected += binascii.hexlify(hash[0:2]) - if info != expected: + if info.encode() != expected: raise Exception("Unexpected FILS Realm Info ANQP-element: " + info) dev[0].request("ERP_FLUSH") @@ -665,15 +665,15 @@ def build_dhcp(req, dhcp_msg, chaddr, giaddr="0.0.0.0", ip_src="0.0.0.0", ip_dst="255.255.255.255", rapid_commit=True, override_op=None, magic_override=None, opt_end=True, extra_op=None): - proto = '\x08\x00' # IPv4 + proto = b'\x08\x00' # IPv4 _ip_src = socket.inet_pton(socket.AF_INET, ip_src) _ip_dst = socket.inet_pton(socket.AF_INET, ip_dst) - _ciaddr = '\x00\x00\x00\x00' - _yiaddr = '\x00\x00\x00\x00' - _siaddr = '\x00\x00\x00\x00' + _ciaddr = b'\x00\x00\x00\x00' + _yiaddr = b'\x00\x00\x00\x00' + _siaddr = b'\x00\x00\x00\x00' _giaddr = socket.inet_pton(socket.AF_INET, giaddr) - _chaddr = binascii.unhexlify(chaddr.replace(':','')) + 10*'\x00' + _chaddr = binascii.unhexlify(chaddr.replace(':','')) + 10 * b'\x00' htype = 1 # Hardware address type; 1 = Ethernet hlen = 6 # Hardware address length hops = 0 @@ -691,14 +691,14 @@ def build_dhcp(req, dhcp_msg, chaddr, giaddr="0.0.0.0", if override_op is not None: op = override_op payload = struct.pack('>BBBBLHH', op, htype, hlen, hops, xid, secs, flags) - sname = 64*'\x00' - file = 128*'\x00' + sname = 64 * b'\x00' + file = 128 * b'\x00' payload += _ciaddr + _yiaddr + _siaddr + _giaddr + _chaddr + sname + file # magic - DHCP if magic_override is not None: payload += magic_override else: - payload += '\x63\x82\x53\x63' + payload += b'\x63\x82\x53\x63' # Option: DHCP Message Type if dhcp_msg is not None: payload += struct.pack('BBB', OPT_DHCP_MESSAGE_TYPE, 1, dhcp_msg) @@ -716,7 +716,7 @@ def build_dhcp(req, dhcp_msg, chaddr, giaddr="0.0.0.0", tot_len = 20 + len(udp) start = struct.pack('>BBHHBBBB', 0x45, 0, tot_len, 0, 0, 0, 128, 17) - ipv4 = start + '\x00\x00' + _ip_src + _ip_dst + ipv4 = start + b'\x00\x00' + _ip_src + _ip_dst csum = ip_checksum(ipv4) ipv4 = start + csum + _ip_src + _ip_dst @@ -776,7 +776,7 @@ def run_fils_sk_hlp(dev, apdev, rapid_commit_server, params): tests = [ "ff:ff:ff:ff:ff:ff aabb", "ff:ff:ff:ff:ff:ff " + 255*'cc', hapd.own_addr() + " ddee010203040506070809", - "ff:ff:ff:ff:ff:ff " + binascii.hexlify(dhcpdisc) ] + "ff:ff:ff:ff:ff:ff " + binascii.hexlify(dhcpdisc).decode() ] for t in tests: if "OK" not in dev[0].request("FILS_HLP_REQ_ADD " + t): raise Exception("FILS_HLP_REQ_ADD failed: " + t) @@ -817,7 +817,7 @@ def run_fils_sk_hlp(dev, apdev, rapid_commit_server, params): raise Exception("Unexpected ethertype in HLP response: %d" % proto) frame = frame[2:] ip = frame[0:20] - if ip_checksum(ip) != '\x00\x00': + if ip_checksum(ip) != b'\x00\x00': raise Exception("IP header checksum mismatch in HLP response") frame = frame[20:] udp = frame[0:8] @@ -835,7 +835,7 @@ def run_fils_sk_hlp(dev, apdev, rapid_commit_server, params): file = frame[0:128] frame = frame[128:] options = frame - if options[0:4] != '\x63\x82\x53\x63': + if options[0:4] != b'\x63\x82\x53\x63': raise Exception("No DHCP magic seen in HLP response") options = options[4:] # TODO: fully parse and validate DHCPACK options @@ -868,7 +868,7 @@ def test_fils_sk_hlp_timeout(dev, apdev, params): raise Exception("Failed to flush pending FILS HLP requests") dhcpdisc = build_dhcp(req=True, dhcp_msg=DHCPDISCOVER, chaddr=dev[0].own_addr()) - if "OK" not in dev[0].request("FILS_HLP_REQ_ADD " + "ff:ff:ff:ff:ff:ff " + binascii.hexlify(dhcpdisc)): + if "OK" not in dev[0].request("FILS_HLP_REQ_ADD " + "ff:ff:ff:ff:ff:ff " + binascii.hexlify(dhcpdisc).decode()): raise Exception("FILS_HLP_REQ_ADD failed") id = dev[0].connect("fils", key_mgmt="FILS-SHA256", eap="PSK", identity="psk.user@example.com", @@ -912,7 +912,7 @@ def test_fils_sk_hlp_oom(dev, apdev, params): raise Exception("Failed to flush pending FILS HLP requests") dhcpdisc = build_dhcp(req=True, dhcp_msg=DHCPDISCOVER, chaddr=dev[0].own_addr()) - if "OK" not in dev[0].request("FILS_HLP_REQ_ADD " + "ff:ff:ff:ff:ff:ff " + binascii.hexlify(dhcpdisc)): + if "OK" not in dev[0].request("FILS_HLP_REQ_ADD " + "ff:ff:ff:ff:ff:ff " + binascii.hexlify(dhcpdisc).decode()): raise Exception("FILS_HLP_REQ_ADD failed") id = dev[0].connect("fils", key_mgmt="FILS-SHA256", eap="PSK", identity="psk.user@example.com", @@ -999,21 +999,21 @@ def test_fils_sk_hlp_req_parsing(dev, apdev, params): tot_len = 20 + 1 start = struct.pack('>BBHHBBBB', 0x45, 0, tot_len, 0, 0, 0, 128, 17) - _ip_src = '\x00\x00\x00\x00' - _ip_dst = '\x00\x00\x00\x00' - ipv4 = start + '\x00\x00' + _ip_src + _ip_dst + _ip_src = b'\x00\x00\x00\x00' + _ip_dst = b'\x00\x00\x00\x00' + ipv4 = start + b'\x00\x00' + _ip_src + _ip_dst csum = ip_checksum(ipv4) ipv4_overflow = start + csum + _ip_src + _ip_dst tot_len = 20 start = struct.pack('>BBHHBBBB', 0x45, 0, tot_len, 0, 0, 0, 128, 123) - ipv4 = start + '\x00\x00' + _ip_src + _ip_dst + ipv4 = start + b'\x00\x00' + _ip_src + _ip_dst csum = ip_checksum(ipv4) ipv4_unknown_proto = start + csum + _ip_src + _ip_dst tot_len = 20 start = struct.pack('>BBHHBBBB', 0x45, 0, tot_len, 0, 0, 0, 128, 17) - ipv4 = start + '\x00\x00' + _ip_src + _ip_dst + ipv4 = start + b'\x00\x00' + _ip_src + _ip_dst csum = ip_checksum(ipv4) ipv4_missing_udp_hdr = start + csum + _ip_src + _ip_dst @@ -1022,14 +1022,14 @@ def test_fils_sk_hlp_req_parsing(dev, apdev, params): udp = struct.pack('>HHHH', src_port, dst_port, 8 + 1, 0) tot_len = 20 + len(udp) start = struct.pack('>BBHHBBBB', 0x45, 0, tot_len, 0, 0, 0, 128, 17) - ipv4 = start + '\x00\x00' + _ip_src + _ip_dst + ipv4 = start + b'\x00\x00' + _ip_src + _ip_dst csum = ip_checksum(ipv4) udp_overflow = start + csum + _ip_src + _ip_dst + udp udp = struct.pack('>HHHH', src_port, dst_port, 7, 0) tot_len = 20 + len(udp) start = struct.pack('>BBHHBBBB', 0x45, 0, tot_len, 0, 0, 0, 128, 17) - ipv4 = start + '\x00\x00' + _ip_src + _ip_dst + ipv4 = start + b'\x00\x00' + _ip_src + _ip_dst csum = ip_checksum(ipv4) udp_underflow = start + csum + _ip_src + _ip_dst + udp @@ -1038,7 +1038,7 @@ def test_fils_sk_hlp_req_parsing(dev, apdev, params): udp = struct.pack('>HHHH', src_port, dst_port, 8, 0) tot_len = 20 + len(udp) start = struct.pack('>BBHHBBBB', 0x45, 0, tot_len, 0, 0, 0, 128, 17) - ipv4 = start + '\x00\x00' + _ip_src + _ip_dst + ipv4 = start + b'\x00\x00' + _ip_src + _ip_dst csum = ip_checksum(ipv4) udp_unknown_port = start + csum + _ip_src + _ip_dst + udp @@ -1047,40 +1047,40 @@ def test_fils_sk_hlp_req_parsing(dev, apdev, params): udp = struct.pack('>HHHH', src_port, dst_port, 8, 0) tot_len = 20 + len(udp) start = struct.pack('>BBHHBBBB', 0x45, 0, tot_len, 0, 0, 0, 128, 17) - ipv4 = start + '\x00\x00' + _ip_src + _ip_dst + ipv4 = start + b'\x00\x00' + _ip_src + _ip_dst csum = ip_checksum(ipv4) dhcp_missing_data = start + csum + _ip_src + _ip_dst + udp dhcp_not_req = build_dhcp(req=True, dhcp_msg=DHCPDISCOVER, chaddr=dev[0].own_addr(), override_op=BOOTREPLY) dhcp_no_magic = build_dhcp(req=True, dhcp_msg=None, - chaddr=dev[0].own_addr(), magic_override='', + chaddr=dev[0].own_addr(), magic_override=bytes(), rapid_commit=False, opt_end=False) dhcp_unknown_magic = build_dhcp(req=True, dhcp_msg=DHCPDISCOVER, chaddr=dev[0].own_addr(), - magic_override='\x00\x00\x00\x00') + magic_override=b'\x00\x00\x00\x00') dhcp_opts = build_dhcp(req=True, dhcp_msg=DHCPNAK, chaddr=dev[0].own_addr(), - extra_op='\x00\x11', opt_end=False) + extra_op=b'\x00\x11', opt_end=False) dhcp_opts2 = build_dhcp(req=True, dhcp_msg=DHCPNAK, chaddr=dev[0].own_addr(), - extra_op='\x11\x01', opt_end=False) + extra_op=b'\x11\x01', opt_end=False) dhcp_valid = build_dhcp(req=True, dhcp_msg=DHCPDISCOVER, chaddr=dev[0].own_addr()) tests = [ "ff", "0800", "0800" + 20*"00", - "0800" + binascii.hexlify(ipv4_overflow), - "0800" + binascii.hexlify(ipv4_unknown_proto), - "0800" + binascii.hexlify(ipv4_missing_udp_hdr), - "0800" + binascii.hexlify(udp_overflow), - "0800" + binascii.hexlify(udp_underflow), - "0800" + binascii.hexlify(udp_unknown_port), - "0800" + binascii.hexlify(dhcp_missing_data), - binascii.hexlify(dhcp_not_req), - binascii.hexlify(dhcp_no_magic), - binascii.hexlify(dhcp_unknown_magic) ] + "0800" + binascii.hexlify(ipv4_overflow).decode(), + "0800" + binascii.hexlify(ipv4_unknown_proto).decode(), + "0800" + binascii.hexlify(ipv4_missing_udp_hdr).decode(), + "0800" + binascii.hexlify(udp_overflow).decode(), + "0800" + binascii.hexlify(udp_underflow).decode(), + "0800" + binascii.hexlify(udp_unknown_port).decode(), + "0800" + binascii.hexlify(dhcp_missing_data).decode(), + binascii.hexlify(dhcp_not_req).decode(), + binascii.hexlify(dhcp_no_magic).decode(), + binascii.hexlify(dhcp_unknown_magic).decode() ] for t in tests: if "OK" not in dev[0].request("FILS_HLP_REQ_ADD ff:ff:ff:ff:ff:ff " + t): raise Exception("FILS_HLP_REQ_ADD failed: " + t) @@ -1099,8 +1099,8 @@ def test_fils_sk_hlp_req_parsing(dev, apdev, params): dev[0].wait_disconnected() dev[0].request("FILS_HLP_REQ_FLUSH") - tests = [ binascii.hexlify(dhcp_opts), - binascii.hexlify(dhcp_opts2) ] + tests = [ binascii.hexlify(dhcp_opts).decode(), + binascii.hexlify(dhcp_opts2).decode() ] for t in tests: if "OK" not in dev[0].request("FILS_HLP_REQ_ADD ff:ff:ff:ff:ff:ff " + t): raise Exception("FILS_HLP_REQ_ADD failed: " + t) @@ -1112,7 +1112,7 @@ def test_fils_sk_hlp_req_parsing(dev, apdev, params): dev[0].wait_disconnected() dev[0].request("FILS_HLP_REQ_FLUSH") - if "OK" not in dev[0].request("FILS_HLP_REQ_ADD ff:ff:ff:ff:ff:ff " + binascii.hexlify(dhcp_valid)): + if "OK" not in dev[0].request("FILS_HLP_REQ_ADD ff:ff:ff:ff:ff:ff " + binascii.hexlify(dhcp_valid).decode()): raise Exception("FILS_HLP_REQ_ADD failed") hapd.set("own_ip_addr", "0.0.0.0") dev[0].select_network(id, freq=2412) @@ -1173,7 +1173,7 @@ def test_fils_sk_hlp_dhcp_parsing(dev, apdev, params): raise Exception("Failed to flush pending FILS HLP requests") dhcpdisc = build_dhcp(req=True, dhcp_msg=DHCPDISCOVER, chaddr=dev[0].own_addr()) - if "OK" not in dev[0].request("FILS_HLP_REQ_ADD " + "ff:ff:ff:ff:ff:ff " + binascii.hexlify(dhcpdisc)): + if "OK" not in dev[0].request("FILS_HLP_REQ_ADD " + "ff:ff:ff:ff:ff:ff " + binascii.hexlify(dhcpdisc).decode()): raise Exception("FILS_HLP_REQ_ADD failed") id = dev[0].connect("fils", key_mgmt="FILS-SHA256", eap="PSK", identity="psk.user@example.com", @@ -1197,16 +1197,16 @@ def test_fils_sk_hlp_dhcp_parsing(dev, apdev, params): dhcpdisc = build_dhcp(req=False, dhcp_msg=DHCPACK, chaddr=dev[0].own_addr(), giaddr="127.0.0.3") #sock.sendto(dhcpdisc[2+20+8:], addr) - chaddr = binascii.unhexlify(dev[0].own_addr().replace(':','')) + 10*'\x00' - tests = [ "\x00", - "\x02" + 500 * "\x00", - "\x02\x00\x00\x00" + 20*"\x00" + "\x7f\x00\x00\x03" + 500 * "\x00", - "\x02\x00\x00\x00" + 20*"\x00" + "\x7f\x00\x00\x03" + 16*"\x00" + 64*"\x00" + 128*"\x00" + "\x63\x82\x53\x63", - "\x02\x00\x00\x00" + 20*"\x00" + "\x7f\x00\x00\x03" + 16*"\x00" + 64*"\x00" + 128*"\x00" + "\x63\x82\x53\x63" + "\x00\x11", - "\x02\x00\x00\x00" + 20*"\x00" + "\x7f\x00\x00\x03" + 16*"\x00" + 64*"\x00" + 128*"\x00" + "\x63\x82\x53\x63" + "\x11\x01", - "\x02\x00\x00\x00" + 20*"\x00" + "\x7f\x00\x00\x03" + chaddr + 64*"\x00" + 128*"\x00" + "\x63\x82\x53\x63" + "\x35\x00\xff", - "\x02\x00\x00\x00" + 20*"\x00" + "\x7f\x00\x00\x03" + chaddr + 64*"\x00" + 128*"\x00" + "\x63\x82\x53\x63" + "\x35\x01\x00\xff", - 1501 * "\x00" ] + chaddr = binascii.unhexlify(dev[0].own_addr().replace(':','')) + 10 * b'\x00' + tests = [ b"\x00", + b"\x02" + 500 * b"\x00", + b"\x02\x00\x00\x00" + 20 * b"\x00" + b"\x7f\x00\x00\x03" + 500 * b"\x00", + b"\x02\x00\x00\x00" + 20 * b"\x00" + b"\x7f\x00\x00\x03" + 16 * b"\x00" + 64 * b"\x00" + 128 * b"\x00" + b"\x63\x82\x53\x63", + b"\x02\x00\x00\x00" + 20 * b"\x00" + b"\x7f\x00\x00\x03" + 16 * b"\x00" + 64 * b"\x00" + 128 * b"\x00" + b"\x63\x82\x53\x63" + b"\x00\x11", + b"\x02\x00\x00\x00" + 20 * b"\x00" + b"\x7f\x00\x00\x03" + 16 * b"\x00" + 64 * b"\x00" + 128 * b"\x00" + b"\x63\x82\x53\x63" + b"\x11\x01", + b"\x02\x00\x00\x00" + 20 * b"\x00" + b"\x7f\x00\x00\x03" + chaddr + 64 * b"\x00" + 128 * b"\x00" + b"\x63\x82\x53\x63" + b"\x35\x00\xff", + b"\x02\x00\x00\x00" + 20 * b"\x00" + b"\x7f\x00\x00\x03" + chaddr + 64 * b"\x00" + 128 * b"\x00" + b"\x63\x82\x53\x63" + b"\x35\x01\x00\xff", + 1501 * b"\x00" ] for t in tests: sock.sendto(t, addr) dev[0].wait_connected() @@ -1234,7 +1234,7 @@ def test_fils_sk_hlp_dhcp_parsing(dev, apdev, params): logger.debug("Received DHCP message from %s" % str(addr)) dhcpoffer = build_dhcp(req=False, dhcp_msg=DHCPOFFER, rapid_commit=False, chaddr=dev[0].own_addr(), giaddr="127.0.0.3", - extra_op="\x00\x11", opt_end=False) + extra_op=b"\x00\x11", opt_end=False) sock.sendto(dhcpoffer[2+20+8:], addr) (msg,addr) = sock.recvfrom(1000) logger.debug("Received DHCP message from %s" % str(addr)) @@ -1249,7 +1249,7 @@ def test_fils_sk_hlp_dhcp_parsing(dev, apdev, params): logger.debug("Received DHCP message from %s" % str(addr)) dhcpoffer = build_dhcp(req=False, dhcp_msg=DHCPOFFER, rapid_commit=False, chaddr=dev[0].own_addr(), giaddr="127.0.0.3", - extra_op="\x11\x01", opt_end=False) + extra_op=b"\x11\x01", opt_end=False) sock.sendto(dhcpoffer[2+20+8:], addr) (msg,addr) = sock.recvfrom(1000) logger.debug("Received DHCP message from %s" % str(addr)) @@ -1264,7 +1264,7 @@ def test_fils_sk_hlp_dhcp_parsing(dev, apdev, params): logger.debug("Received DHCP message from %s" % str(addr)) dhcpoffer = build_dhcp(req=False, dhcp_msg=DHCPOFFER, rapid_commit=False, chaddr=dev[0].own_addr(), giaddr="127.0.0.3", - extra_op="\x36\x01\x30") + extra_op=b"\x36\x01\x30") sock.sendto(dhcpoffer[2+20+8:], addr) (msg,addr) = sock.recvfrom(1000) logger.debug("Received DHCP message from %s" % str(addr)) @@ -1276,8 +1276,8 @@ def test_fils_sk_hlp_dhcp_parsing(dev, apdev, params): dev[0].request("FILS_HLP_REQ_FLUSH") dhcpdisc = build_dhcp(req=True, dhcp_msg=DHCPDISCOVER, chaddr=dev[0].own_addr(), - extra_op="\x00\x11", opt_end=False) - if "OK" not in dev[0].request("FILS_HLP_REQ_ADD " + "ff:ff:ff:ff:ff:ff " + binascii.hexlify(dhcpdisc)): + extra_op=b"\x00\x11", opt_end=False) + if "OK" not in dev[0].request("FILS_HLP_REQ_ADD " + "ff:ff:ff:ff:ff:ff " + binascii.hexlify(dhcpdisc).decode()): raise Exception("FILS_HLP_REQ_ADD failed") dev[0].dump_monitor() dev[0].select_network(id, freq=2412) @@ -1285,7 +1285,7 @@ def test_fils_sk_hlp_dhcp_parsing(dev, apdev, params): logger.debug("Received DHCP message from %s" % str(addr)) dhcpoffer = build_dhcp(req=False, dhcp_msg=DHCPOFFER, rapid_commit=False, chaddr=dev[0].own_addr(), giaddr="127.0.0.3", - extra_op="\x36\x01\x30") + extra_op=b"\x36\x01\x30") sock.sendto(dhcpoffer[2+20+8:], addr) dev[0].wait_connected() dev[0].request("DISCONNECT") @@ -1295,8 +1295,8 @@ def test_fils_sk_hlp_dhcp_parsing(dev, apdev, params): dev[0].request("FILS_HLP_REQ_FLUSH") dhcpdisc = build_dhcp(req=True, dhcp_msg=DHCPDISCOVER, chaddr=dev[0].own_addr(), - extra_op="\x11\x01", opt_end=False) - if "OK" not in dev[0].request("FILS_HLP_REQ_ADD " + "ff:ff:ff:ff:ff:ff " + binascii.hexlify(dhcpdisc)): + extra_op=b"\x11\x01", opt_end=False) + if "OK" not in dev[0].request("FILS_HLP_REQ_ADD " + "ff:ff:ff:ff:ff:ff " + binascii.hexlify(dhcpdisc).decode()): raise Exception("FILS_HLP_REQ_ADD failed") dev[0].dump_monitor() dev[0].select_network(id, freq=2412) @@ -1304,7 +1304,7 @@ def test_fils_sk_hlp_dhcp_parsing(dev, apdev, params): logger.debug("Received DHCP message from %s" % str(addr)) dhcpoffer = build_dhcp(req=False, dhcp_msg=DHCPOFFER, rapid_commit=False, chaddr=dev[0].own_addr(), giaddr="127.0.0.3", - extra_op="\x36\x01\x30") + extra_op=b"\x36\x01\x30") sock.sendto(dhcpoffer[2+20+8:], addr) dev[0].wait_connected() dev[0].request("DISCONNECT") @@ -1967,7 +1967,7 @@ def test_fils_assoc_replay(dev, apdev, params): req = hapd.mgmt_rx() count += 1 hapd.dump_monitor() - hapd.request("MGMT_RX_PROCESS freq=2412 datarate=0 ssi_signal=-30 frame=" + binascii.hexlify(req['frame'])) + hapd.request("MGMT_RX_PROCESS freq=2412 datarate=0 ssi_signal=-30 frame=" + binascii.hexlify(req['frame']).decode()) if req['subtype'] == 0: assocreq = req ev = hapd.wait_event(["MGMT-TX-STATUS"], timeout=5) @@ -1989,7 +1989,7 @@ def test_fils_assoc_replay(dev, apdev, params): logger.info("Replay the last Association Request frame") hapd.dump_monitor() hapd.set("ext_mgmt_frame_handling", "1") - hapd.request("MGMT_RX_PROCESS freq=2412 datarate=0 ssi_signal=-30 frame=" + binascii.hexlify(req['frame'])) + hapd.request("MGMT_RX_PROCESS freq=2412 datarate=0 ssi_signal=-30 frame=" + binascii.hexlify(req['frame']).decode()) ev = hapd.wait_event(["MGMT-TX-STATUS"], timeout=5) if ev is None: raise Exception("No TX status seen")