From patchwork Thu Jan 31 08:15:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masashi Honma X-Patchwork-Id: 1034032 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="pf2oUiFn"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ebS71JYK"; 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 43qtbr6s6tz9sBb for ; Thu, 31 Jan 2019 19:26:00 +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=+jOiM0VcKJKlFyndmPe85ErugECk4VpWV7sX+WsboC8=; b=pf2oUiFncJMh/lNrUbL6WoNyQ6 IkoZrg34eHZAj4/DS1mSuxAAEc92BWNa+fIQfYOHsWAIqp0OjDhp0G1W5Ds70t3EjhqMCv9MIBjW4 wyZVL0/tBPnnYFlC6SHC9lk9HL0tX2Hi8jR5kIhYSA8clmy0/6JNk9Jho2hBjQ1qj3HY3Jl+/qgXH 8HhmwkeprM1PgyjbyuAkaTMPT54h4PhGwgqLUzOdKZDj9pIBVishTG4dHQxTHJ/92k+1E690xoJfN uMPbIf3/mbCRqXUGy1DZ0CExT2Sj0TLRuvKtCnDRjD27YXgysg4/ox8XCp2J03i8Xvt1GxmgI3s/E HT5SN4rA==; 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 1gp7fV-00051a-08; Thu, 31 Jan 2019 08:25:53 +0000 Received: from mail-pg1-x52e.google.com ([2607:f8b0:4864:20::52e]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gp7Wn-0004FX-AG for hostap@lists.infradead.org; Thu, 31 Jan 2019 08:17:01 +0000 Received: by mail-pg1-x52e.google.com with SMTP id n2so1057102pgm.3 for ; Thu, 31 Jan 2019 00:16:53 -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=dKaYUIf7ayOA6rcF17js3lXNu2wu/NteJdF++PGCkI8=; b=ebS71JYKTspu1vgfbQKf8Q8MW/vPWdzTmTzZhKZ6SppUvWZqM9k2COfhCBHCw9rhdC gvlnAL4QBYoHFXCpWElVTiYi6BNCY3td5gE06F1TNWSRsElBtWkpE5wXQg4xL20QvedG tZ3Lo3eG/WGjHVVoDWmh5iWIRYblXCeXTrkfUmpY+kdLREjVU5OrOJQIY8iDAJQfV6ev N/USEWOLaIQzVvA1peyLv2yJRs5Cs6tA4SZDFWjuiYg7lZG+y0yXgW2XHTtyZ0CrJuO3 aN8INlMFz59yecQN8g6VZ2Kx272pw3WFi2iWxxq3fqMSd7bFpAFOJ2kpcA5kquUVdtYm cjKw== 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=dKaYUIf7ayOA6rcF17js3lXNu2wu/NteJdF++PGCkI8=; b=bRxQzlAO3zcoIUCVnuh+F18d6qO0ZDGcUJ5f/PFGP+qZzOXhhNJxYlw+6YgC58AH9B Uett5IC7KKpBz62BYY/PMQd2qFqFqWgfWN+jnTCiM+nSKKyd5XmumNZLrg2LUOjwwGif xveMLxQuagXgDAsR2cXChaSx1e2xt7HK/KRqyeWU4Bww9grr9UYjmvaAs/xQKZ/lXdEn wZpElPB8J3pUWDqN3yoseWu0knQQ659H9qPEBNLtG6Jlh2VLGPBy4U6jN6EHSsWQxWFt mstmw+Butz4uWkB/OEmHZeX8uUlAAEnliHbb6JN9/ZuRCaEwaBSZKgStv4kC4oq0D26g qkrQ== X-Gm-Message-State: AJcUukfazvbn2Y87flZ0pFG4/RGn870fxIFxyWI5z/exd8Zc9oxFSrAc gTih1dn2GG0hW2xPucXCsktHOxrK X-Google-Smtp-Source: ALg8bN6gQTK7bua7xnUEp+oOTUg6rNHultEC1xmlIGPnVN0us0NhXnkNcLn1SsnNuBQy9V/OqDId2A== X-Received: by 2002:a62:f907:: with SMTP id o7mr33334060pfh.244.1548922612243; Thu, 31 Jan 2019 00:16:52 -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.16.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Jan 2019 00:16:51 -0800 (PST) From: Masashi Honma To: hostap@lists.infradead.org Subject: [PATCH v2 08/38] tests: Modify ap_psk test sets for python3 Date: Thu, 31 Jan 2019 17:15:47 +0900 Message-Id: <20190131081617.5005-9-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_001653_885884_8E062CEA X-CRM114-Status: GOOD ( 10.97 ) 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:52e 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_ap_psk.py | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/tests/hwsim/test_ap_psk.py b/tests/hwsim/test_ap_psk.py index 780f18bc7..92919b7f8 100644 --- a/tests/hwsim/test_ap_psk.py +++ b/tests/hwsim/test_ap_psk.py @@ -1239,16 +1239,19 @@ def build_eapol(msg): data += msg['rsn_key_id'] data += msg['rsn_key_mic'] data += struct.pack('>H', msg['rsn_key_data_len']) - data += msg['rsn_key_data'] + if type(msg['rsn_key_data']) == bytes: + data += msg['rsn_key_data'] + else: + data += msg['rsn_key_data'].encode() else: data += msg['payload'] return data def sha1_prf(key, label, data, outlen): - res = '' + res = bytes() counter = 0 while outlen > 0: - m = hmac.new(key, label, hashlib.sha1) + m = hmac.new(key, label.encode(), hashlib.sha1) m.update(struct.pack('B', 0)) m.update(data) m.update(struct.pack('B', counter)) @@ -1307,7 +1310,7 @@ def recv_eapol(hapd): return parse_eapol(eapol) def send_eapol(hapd, addr, data): - res = hapd.request("EAPOL_RX " + addr + " " + binascii.hexlify(data)) + res = hapd.request("EAPOL_RX " + addr + " " + binascii.hexlify(data).decode()) if "OK" not in res: raise Exception("EAPOL_RX to hostapd failed") @@ -1617,24 +1620,31 @@ def build_eapol_key_3_4(anonce, kck, key_data, replay_counter=2, return msg def aes_wrap(kek, plain): - n = len(plain) / 8 + n = len(plain) // 8 a = 0xa6a6a6a6a6a6a6a6 enc = AES.new(kek).encrypt r = [plain[i * 8:(i + 1) * 8] for i in range(0, n)] for j in range(6): for i in range(1, n + 1): - b = enc(struct.pack('>Q', a) + r[i - 1]) + if type(r[i - 1]) == bytes: + value = r[i - 1] + else: + value = r[i - 1].encode() + b = enc(struct.pack('>Q', a) + value) a = struct.unpack('>Q', b[:8])[0] ^ (n * j + i) r[i - 1] =b[8:] - return struct.pack('>Q', a) + ''.join(r) + ret = bytes() + for elem in r: + ret = ret + elem + return struct.pack('>Q', a) + ret def pad_key_data(plain): pad_len = len(plain) % 8 if pad_len: pad_len = 8 - pad_len - plain += '\xdd' + plain += b'\xdd' pad_len -= 1 - plain += pad_len * '\0' + plain += pad_len * b'\x00' return plain def test_ap_wpa2_psk_supp_proto(dev, apdev):