From patchwork Sun Oct 13 12:45:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Otcheretianski X-Patchwork-Id: 1996529 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=CIfZtxXB; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=grHKzv5g; 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 4XRKyZ2hWpz1xvC for ; Sun, 13 Oct 2024 23:52:35 +1100 (AEDT) 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: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:In-Reply-To:References: List-Owner; bh=jy75W2pSzIsHppEDXnt2CHH5bNiDRb3iJ/3oLZVeHZM=; b=CIfZtxXBzkezqj qZtcPelLwV4gPy1DRw7qSQkVXC/0zpGK7JzR0me4183ACq3UnpbK6P8VCv9sj1h0271xTTbE/atwa KHN947wKJuiu8XHQ5KA0p+bJbAQzYkdlwQzrTKM+EV1jaPEUXQ7/ualYYvVhmHSTk1WzSP2BM9orw QXNk/HIr3uXlV6mNsv9Spqlcjx5i76Ercla3Eht69wskXRG3G5j6EaF98vTz25OymX87DOOMuBF4H GU5YOgD4TaWzglebKZqvVHByvBq501tFBOqF4bKKEtEYSBoaDFb2TcRR6fN9brh2SmiBDbc8GPphW SFJSIqmGWrFvnQ2LPqww==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1szy4b-00000002fh3-1Tfx; Sun, 13 Oct 2024 12:51:49 +0000 Received: from mgamail.intel.com ([198.175.65.15]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1szy4X-00000002fgc-2mPA for hostap@lists.infradead.org; Sun, 13 Oct 2024 12:51:47 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1728823906; x=1760359906; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=F5SgyWAKopKD6KXWBFZkDUxTLVdu6+FwyVmsHxdq/mI=; b=grHKzv5gtzZy61H3LfBC4dmrx9Qm+FgtzjsBV3tlSCWANJUBzudzwpSS mbRl/7YQqtw7hox8wsfNThuXRG3UXG3SGVRGQ6vnPQZAJq9PSBPMDa424 d6dbjJ1b6HSuSSD5WoV0GNpwHNetg5ljtR6rrf2hiLmMd1c0KXsJyDVhR /PdnmsTq7QC+WFskNPWnc/WN43NPd1WG/E7ehm3apRGJ0kQALeaCkJwS2 0yd7BhXnBfs+gA4CEzSjZ0yaS/6TeS/cylHHJQ4bVgo51HszbGqMDEC+Q Q7WHGT8Jc2hLKvZkA/huyddyW9pqMDhvwDiesXm/2IXjd39JNdGby2eXy A==; X-CSE-ConnectionGUID: RTgjGnVeQSePJGzVnjCxTQ== X-CSE-MsgGUID: x07F9CAjTKaDoS56IF+kNg== X-IronPort-AV: E=McAfee;i="6700,10204,11222"; a="31872085" X-IronPort-AV: E=Sophos;i="6.11,199,1725346800"; d="scan'208";a="31872085" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by orvoesa107.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Oct 2024 05:51:42 -0700 X-CSE-ConnectionGUID: U33bQDsESSG5YA97+MnCQQ== X-CSE-MsgGUID: O8UvUFhJSVaCi96vEMbw6g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.11,200,1725346800"; d="scan'208";a="76980348" Received: from weis0042.iil.intel.com ([10.12.217.211]) by fmviesa007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Oct 2024 05:51:39 -0700 From: Andrei Otcheretianski To: hostap@lists.infradead.org Cc: Andrei Otcheretianski Subject: [PATCH] P2P2: Remove redundant enable_pairing_verification flag Date: Sun, 13 Oct 2024 15:45:23 +0300 Message-ID: <20241013124523.656518-1-andrei.otcheretianski@intel.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241013_055145_775959_F4DC95D3 X-CRM114-Status: UNSURE ( 9.22 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -5.7 (-----) X-Spam-Report: Spam detection software, running on the system "bombadil.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: This is a duplicate of enable_pairing_cache flag. Remove it. Signed-off-by: Andrei Otcheretianski --- src/p2p/p2p.c | 1 - src/p2p/p2p.h | 5 ----- src/p2p/p2p_build.c | 3 +-- src/p2p/p2p_pd.c | 1 - 4 files changed, 1 insertion(+ [...] Content analysis details: (-5.7 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [198.175.65.15 listed in list.dnswl.org] 0.0 RCVD_IN_VALIDITY_SAFE_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [198.175.65.15 listed in sa-accredit.habeas.com] 0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [198.175.65.15 listed in sa-trusted.bondedsender.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -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 Message has at least one valid DKIM or DK signature -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 -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -1.3 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [198.175.65.15 listed in wl.mailspike.net] 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [198.175.65.15 listed in bl.score.senderscore.com] -0.0 DKIMWL_WL_HIGH DKIMwl.org - High trust sender 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 This is a duplicate of enable_pairing_cache flag. Remove it. Signed-off-by: Andrei Otcheretianski --- src/p2p/p2p.c | 1 - src/p2p/p2p.h | 5 ----- src/p2p/p2p_build.c | 3 +-- src/p2p/p2p_pd.c | 1 - 4 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/p2p/p2p.c b/src/p2p/p2p.c index e109e320ca..703fe92447 100644 --- a/src/p2p/p2p.c +++ b/src/p2p/p2p.c @@ -5890,7 +5890,6 @@ struct wpabuf * p2p_usd_elems(struct p2p_data *p2p) if (p2p->pairing_info && p2p->cfg->pairing_config.pairing_capable && p2p->cfg->pairing_config.enable_pairing_cache && - p2p->cfg->pairing_config.enable_pairing_verification && p2p_derive_nonce_tag(p2p) == 0) p2p_buf_add_dira(buf, p2p); diff --git a/src/p2p/p2p.h b/src/p2p/p2p.h index 56b80d89eb..cdd926fd53 100644 --- a/src/p2p/p2p.h +++ b/src/p2p/p2p.h @@ -349,11 +349,6 @@ struct p2p_pairing_config { */ bool enable_pairing_cache; - /** - * Enable P2P pairing verification with cached NIK/NPK - */ - bool enable_pairing_verification; - /** * P2P bootstrapping methods supported */ diff --git a/src/p2p/p2p_build.c b/src/p2p/p2p_build.c index ddadd34bc5..44809c2159 100644 --- a/src/p2p/p2p_build.c +++ b/src/p2p/p2p_build.c @@ -806,8 +806,7 @@ void p2p_buf_add_dira(struct wpabuf *buf, struct p2p_data *p2p) struct p2p_id_key *dev_ik; if (!p2p->cfg->pairing_config.pairing_capable || - !p2p->cfg->pairing_config.enable_pairing_cache || - !p2p->cfg->pairing_config.enable_pairing_verification) + !p2p->cfg->pairing_config.enable_pairing_cache) return; dev_ik = &p2p->pairing_info->dev_ik; diff --git a/src/p2p/p2p_pd.c b/src/p2p/p2p_pd.c index 7581fbfdef..f2d5ee4884 100644 --- a/src/p2p/p2p_pd.c +++ b/src/p2p/p2p_pd.c @@ -703,7 +703,6 @@ void p2p_process_pcea(struct p2p_data *p2p, struct p2p_message *msg, if (dev->info.pcea_cap_info & P2P_PCEA_PMK_CACHING) { dev->info.pairing_config.enable_pairing_cache = true; - dev->info.pairing_config.enable_pairing_verification = true; } }