From patchwork Fri Jun 14 08:13:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Berg X-Patchwork-Id: 1947742 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=a+GqBdKo; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=infradead.org header.i=@infradead.org header.a=rsa-sha256 header.s=desiato.20200630 header.b=phg3hIbu; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=sipsolutions.net header.i=@sipsolutions.net header.a=rsa-sha256 header.s=mail header.b=taFq2gVF; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=patchwork.ozlabs.org) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4W0sY14yvtz20QH for ; Fri, 14 Jun 2024 18:15:49 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=7tI9KpRUVTzk5F5fFPFHeQUW8OEi5ngMUToxCKUP89Q=; b=a+GqBdKocYZ4ME bQQiurwb26ExDXRDcF7gTbM1p8Fy6MRgNj9T0U/StuLu15m32Mn5kiFItxzUSa+hknWmEQUEjn6sM zrfGxBpdmy/PA8CF37UTQIKETVgVPrTYc0EtLm3XJBapgShSEGOlITwWsdV33IvMaAS4ABUMvB4dB cW9s29GJMvLzxR3Zakz8rzBv7VHJAQHhYPUctvQ5UMJYEy3kbDaUnZNWuMLVSp3nxjAK1D5uW/yb4 bVl3aGlrqUQ91XW186T0GKXJW19wXekJ6K9NJ8trCa6QoKOgAdHlmUqOdZTX2lU3JdxYe1ipjKIBt tu7Huvz0rWoABJuHtzhA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sI25o-00000001wgt-1dz0; Fri, 14 Jun 2024 08:15:28 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sI25e-00000001wX7-0nf7 for hostap@bombadil.infradead.org; Fri, 14 Jun 2024 08:15:18 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=WyKY8R7niGZQsc2KKWIb9dwSyg1cz+cLYiNhcdzWOtI=; b=phg3hIbup5MIz9jkZdQFu+wcfw VWec6E97yhivVH7MWUkISee/JMPF5JBQuJYWt0z1A0HX4LGj9mZBh2rL4QOe2REqSmGArgzE9tN6q Ofa3CZo/C91Xlg5LG6i4HBUQuB6N1fC1YyeVsDP8K9T0v+/voc1j7DjTEFnzv12txC/ZaT6ygQl9y 7THkTZygUZnxzZMAtO8AUab08WiWD8Kz84gRVqA60jGI9xGmirRgKSt6taX+30jxYVeaO3cJ48X/2 nLTwFwwoQhK/Ov6zfnxa89uxiycqDAuWa3hteSFwW07hSacDG3wHWQnh64ceCyTXUYgCtw4yBriH2 L0SwMfxQ==; Received: from s3.sipsolutions.net ([2a01:4f8:242:246e::2] helo=sipsolutions.net) by desiato.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sI25B-00000004CFS-1Umn for hostap@lists.infradead.org; Fri, 14 Jun 2024 08:15:00 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sipsolutions.net; s=mail; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Content-Type:Sender :Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-To: Resent-Cc:Resent-Message-ID; bh=WyKY8R7niGZQsc2KKWIb9dwSyg1cz+cLYiNhcdzWOtI=; t=1718352889; x=1719562489; b=taFq2gVFCYm+1JxAhuDGr+pcgSG2mhD5ZoGAiaE5363wYbZ I93ZYac2pIOGY2bQWE4hgIvyOw3mrxnSOtsKqN06lnMd4A/AfPqn3QDshdwmLGm4nThwSXaozWlji MzyttdZilV6ukda7Cmuy2bT3YX2N9NXtYqFE8IB9zpXE3SvA/UVVeSd7dTw1028pYEMjsKd2Xep+F X4QA7sxZ3O75ntWumMfnrcdqTVwXTvygI3o2rh8pFRWpVRf5jqqrr78A/gES2mlu8F2vuGU6NzoqY h5aRgOj8AfaVjITEXvDe2MyBL50FcOVoxWEIQuLSNLDM9FFLezVjaRIT1H2d9DEQ==; Received: by sipsolutions.net with esmtpsa (TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.97) (envelope-from ) id 1sI25A-0000000DZLi-08mf; Fri, 14 Jun 2024 10:14:48 +0200 From: benjamin@sipsolutions.net To: hostap@lists.infradead.org Cc: Benjamin Berg Subject: [PATCH 07/10] tests: Use sha256_prf_bits for failure stack matching Date: Fri, 14 Jun 2024 10:13:48 +0200 Message-ID: <20240614081351.2088185-8-benjamin@sipsolutions.net> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240614081351.2088185-1-benjamin@sipsolutions.net> References: <20240614081351.2088185-1-benjamin@sipsolutions.net> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240614_091453_025267_F62DE728 X-CRM114-Status: UNSURE ( 9.94 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "desiato.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: From: Benjamin Berg It seems that sha256_prf may not always be in the stack trace for failure checking, possibly due to tail call optimization as it simply calls sha256_prf_bits with updated parameters. Simply match agai [...] Content analysis details: (-0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.0 T_SCC_BODY_TEXT_LINE No description available. X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Benjamin Berg It seems that sha256_prf may not always be in the stack trace for failure checking, possibly due to tail call optimization as it simply calls sha256_prf_bits with updated parameters. Simply match against sha256_prf_bits directly to avoid issues due to optimizations. Signed-off-by: Benjamin Berg --- tests/hwsim/test_ap_psk.py | 2 +- tests/hwsim/test_sae.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/hwsim/test_ap_psk.py b/tests/hwsim/test_ap_psk.py index 9e34e7b6df..085619f0d3 100644 --- a/tests/hwsim/test_ap_psk.py +++ b/tests/hwsim/test_ap_psk.py @@ -3418,7 +3418,7 @@ def test_ap_wpa2_psk_local_error(dev, apdev): dev[0].request("REMOVE_NETWORK all") dev[0].dump_monitor() - with fail_test(dev[0], 1, "sha256_prf;wpa_pmk_to_ptk"): + with fail_test(dev[0], 1, "sha256_prf_bits;wpa_pmk_to_ptk"): id = dev[0].connect(ssid, key_mgmt="WPA-PSK-SHA256", psk=passphrase, scan_freq="2412", wait_connect=False) ev = dev[0].wait_event(["CTRL-EVENT-DISCONNECTED"], timeout=5) diff --git a/tests/hwsim/test_sae.py b/tests/hwsim/test_sae.py index aceb927516..b85bcdd556 100644 --- a/tests/hwsim/test_sae.py +++ b/tests/hwsim/test_sae.py @@ -1574,7 +1574,7 @@ def test_sae_bignum_failure(dev, apdev): (2, "crypto_ec_point_mul;sae_derive_k_ecc"), (1, "crypto_ec_point_to_bin;sae_derive_k_ecc"), (1, "crypto_bignum_legendre;dragonfly_get_random_qr_qnr"), - (1, "sha256_prf;sae_derive_keys"), + (1, "sha256_prf_bits;sae_derive_keys"), (1, "crypto_bignum_init;sae_derive_keys"), (1, "crypto_bignum_init_set;sae_parse_commit_scalar"), (1, "crypto_bignum_to_bin;sae_parse_commit_element_ecc"),