From patchwork Wed May 6 13:42:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Berg X-Patchwork-Id: 1284461 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) 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=none (p=none dis=none) header.from=sipsolutions.net Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20170209 header.b=uIe3bhTn; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49HHpt0jTHz9sSy for ; Wed, 6 May 2020 23:43:02 +1000 (AEST) 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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version: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=wXXFZMZQWowQUaBdwDv1h/lnwJnhervNAi74EcQYu3s=; b=uIe3bhTnNgcRTC TF4Qq9DuiPBEndDXA4cECj8lfUbXH5nZd2mpPQ++72XxSq2C8yugm+aqgzukPG+4DCgzvvqIHlpsG Pogd+XLEFAVU4BDnZU4W346Pv2sKG0dYxYH8RtJ3TMXJy5/23TB8tS1JiYWa3zPM6qF6V1juZr2ar 4MlAyYKkfyQCwc30hPPufhJ8Han67B3RRL9n2KChxrV0XwUJKOCX0PGV/0+cQ8qdErbqqqCfSlci9 ukpl9QlCDZ7ra4XJvmJjA6+FgcATJ+9WKDhSi2Am4CJCiFjIyK5Ia+lna7ollUqYYqVNz9Aj38gcl /N9d5SktBuQgrb6dOfqQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jWKK5-00018I-EH; Wed, 06 May 2020 13:42:53 +0000 Received: from s3.sipsolutions.net ([2a01:4f8:191:4433::2] helo=sipsolutions.net) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jWKJl-0000mR-1X for hostap@lists.infradead.org; Wed, 06 May 2020 13:42:35 +0000 Received: by sipsolutions.net with esmtpsa (TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.93) (envelope-from ) id 1jWKJf-006pQI-ND; Wed, 06 May 2020 15:42:27 +0200 From: Johannes Berg To: hostap@lists.infradead.org Subject: [PATCH 4/5] test_ap_ciphers: reset the correct key's PN Date: Wed, 6 May 2020 15:42:15 +0200 Message-Id: <1588772536-I9e0ebc7d665833ae649f93128da4ef7446bf3c22@changeid> X-Mailer: git-send-email 2.25.1 In-Reply-To: <1588772536-I8f7f07654f74c5ea9f22e934c42096982b555701@changeid> References: <1588772536-I8f7f07654f74c5ea9f22e934c42096982b555701@changeid> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200506_064233_093148_9B23F386 X-CRM114-Status: GOOD ( 11.58 ) X-Spam-Score: 0.3 (/) X-Spam-Report: SpamAssassin version 3.4.4 on bombadil.infradead.org summary: Content analysis details: (0.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_NONE SPF: sender does not publish an SPF Record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.3 KHOP_HELO_FCRDNS Relay HELO differs from its IP's reverse DNS X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Johannes Berg Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Johannes Berg While adding support for IGTK and BIGTK here, I tested this without protections (i.e. with protections removed from both supplicant and driver), and while I got some bad resets on the debugfs values, it should have failed with "unexpected connectivity". Fix this to be correct - we need to reset the GTK PN, not the PTK PN in this test. Signed-off-by: Johannes Berg --- tests/hwsim/test_ap_ciphers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/hwsim/test_ap_ciphers.py b/tests/hwsim/test_ap_ciphers.py index 6726e90d054a..741e3a5cba73 100644 --- a/tests/hwsim/test_ap_ciphers.py +++ b/tests/hwsim/test_ap_ciphers.py @@ -853,7 +853,7 @@ def run_ap_wpa2_delayed_group_m1_retransmission(dev, apdev): time.sleep(0.1) after = get_rx_spec(phy, keytype=KT_GTK).splitlines() - if "OK" not in hapd.request("RESET_PN " + addr): + if "OK" not in hapd.request("RESET_PN ff:ff:ff:ff:ff:ff"): raise Exception("RESET_PN failed") time.sleep(0.1) hwsim_utils.test_connectivity(dev[0], hapd, timeout=1,