[06/12] MLD STA: Configure pairwise keys using MLD address

Message ID	20220825055311.3327147-7-quic_vjakkam@quicinc.com
State	Changes Requested
Headers	show Return-Path: <hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org> From: Veerendranath Jakkam <quic_vjakkam@quicinc.com> To: <hostap@lists.infradead.org> CC: <quic_vjakkam@quicinc.com> Subject: [PATCH 06/12] MLD STA: Configure pairwise keys using MLD address Date: Thu, 25 Aug 2022 11:23:05 +0530 Message-ID: <20220825055311.3327147-7-quic_vjakkam@quicinc.com> In-Reply-To: <20220825055311.3327147-1-quic_vjakkam@quicinc.com> References: <20220825055311.3327147-1-quic_vjakkam@quicinc.com> MIME-Version: 1.0 preview: Configure the pairwise keys with MLD address when plubing to driver. Current changes handling only EAPOL Four-Way handshake. Signed-off-by: Veerendranath Jakkam <quic_vjakkam@quicinc.com> --- src/rsn_supp/wpa.c \| 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) Content analysis details: (-0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [205.220.180.131 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -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 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 Precedence: list Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Hostap" <hostap-bounces@lists.infradead.org> Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org
Series	MLD STA: Add support for four-way handshake and SAE external authentication \| expand [00/12] MLD STA: Add support for four-way handshake and SAE external authentication [01/12] MLD STA: Add support for parsing MLO KDEs [02/12] MLD STA: set MLO connection info to wpa_sm [03/12] MLD STA: Add support to fetch per-link beacon WPA/RSN/RSNX IEs into wpa_sm [04/12] MLD STA: Add MLO KDEs for 2/4 and 4/4 EAPOL frames [05/12] MLD STA: Derive pairwise keys using MLD address [06/12] MLD STA: Configure pairwise keys using MLD address [07/12] MLD STA: Add support to configure keys with MLO link ID param [08/12] MLD STA: Add support for processing EAPOL 3/4 frame [09/12] MLD STA: Add support for validating MLO KDEs for 4WHS EAPOL frames [10/12] MLD STA: Use AP MLD address as destination for 4WHS EAPOL frames [11/12] MLD STA: Add support for SAE external auth support [12/12] MLD STA: Indicate MLO support for security modes to driver's SME

Message ID

20220825055311.3327147-7-quic_vjakkam@quicinc.com

State

Changes Requested

Headers

From: Veerendranath Jakkam <quic_vjakkam@quicinc.com>
To: <hostap@lists.infradead.org>
CC: <quic_vjakkam@quicinc.com>
Subject: [PATCH 06/12] MLD STA: Configure pairwise keys using MLD address
Date: Thu, 25 Aug 2022 11:23:05 +0530
Message-ID: <20220825055311.3327147-7-quic_vjakkam@quicinc.com>
In-Reply-To: <20220825055311.3327147-1-quic_vjakkam@quicinc.com>
References: <20220825055311.3327147-1-quic_vjakkam@quicinc.com>
MIME-Version: 1.0
Precedence: list
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Sender: "Hostap" <hostap-bounces@lists.infradead.org>
Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org

Series

MLD STA: Add support for four-way handshake and SAE external authentication | expand

Commit Message

Veerendranath Jakkam Aug. 25, 2022, 5:53 a.m. UTC

Configure the pairwise keys with MLD address when plubing to driver.
Current changes handling only EAPOL Four-Way handshake.

Signed-off-by: Veerendranath Jakkam <quic_vjakkam@quicinc.com>
---
 src/rsn_supp/wpa.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

Comments

Peer, Ilan Sept. 13, 2022, 7:30 a.m. UTC | #1

Hi,

> From: Hostap <hostap-bounces@lists.infradead.org> On Behalf Of
> Veerendranath Jakkam
> Sent: Thursday, August 25, 2022 08:53
> To: hostap@lists.infradead.org
> Cc: quic_vjakkam@quicinc.com
> Subject: [PATCH 06/12] MLD STA: Configure pairwise keys using MLD address
> 
> Configure the pairwise keys with MLD address when plubing to driver.

Plumbing? 😊

> key_rsc,
> +	if (sm->valid_links)
> +		auth_addr = sm->ap_mld_addr;
> +	else
> +		auth_addr = sm->bssid;
> +

Same here. I think it would be simpler to use a function to get the authenticator address.

Regards,

Ilan.

diff --git a/src/rsn_supp/wpa.c b/src/rsn_supp/wpa.c
index 66b94bd12..8ac22eac9 100644
--- a/src/rsn_supp/wpa.c
+++ b/src/rsn_supp/wpa.c
@@ -1007,6 +1007,7 @@  static int wpa_supplicant_install_ptk(struct wpa_sm *sm,
 	int keylen, rsclen;
 	enum wpa_alg alg;
 	const u8 *key_rsc;
+	u8 *auth_addr;
 
 	if (sm->ptk.installed) {
 		wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG,
@@ -1046,13 +1047,18 @@  static int wpa_supplicant_install_ptk(struct wpa_sm *sm,
 		wpa_hexdump(MSG_DEBUG, "WPA: RSC", key_rsc, rsclen);
 	}
 
-	if (wpa_sm_set_key(sm, alg, sm->bssid, sm->keyidx_active, 1, key_rsc,
+	if (sm->valid_links)
+		auth_addr = sm->ap_mld_addr;
+	else
+		auth_addr = sm->bssid;
+
+	if (wpa_sm_set_key(sm, alg, auth_addr, sm->keyidx_active, 1, key_rsc,
 			   rsclen, sm->ptk.tk, keylen,
 			   KEY_FLAG_PAIRWISE | key_flag) < 0) {
 		wpa_msg(sm->ctx->msg_ctx, MSG_WARNING,
-			"WPA: Failed to set PTK to the driver (alg=%d keylen=%d bssid="
+			"WPA: Failed to set PTK to the driver (alg=%d keylen=%d auth_addr="
 			MACSTR " idx=%d key_flag=0x%x)",
-			alg, keylen, MAC2STR(sm->bssid),
+			alg, keylen, MAC2STR(auth_addr),
 			sm->keyidx_active, key_flag);
 		return -1;
 	}
@@ -1077,11 +1083,13 @@  static int wpa_supplicant_install_ptk(struct wpa_sm *sm,
 
 static int wpa_supplicant_activate_ptk(struct wpa_sm *sm)
 {
+	const u8 *peer_addr = sm->valid_links ? sm->ap_mld_addr : sm->bssid;
+
 	wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG,
 		"WPA: Activate PTK (idx=%d bssid=" MACSTR ")",
 		sm->keyidx_active, MAC2STR(sm->bssid));
 
-	if (wpa_sm_set_key(sm, 0, sm->bssid, sm->keyidx_active, 0, NULL, 0,
+	if (wpa_sm_set_key(sm, 0, peer_addr, sm->keyidx_active, 0, NULL, 0,
 			   NULL, 0, KEY_FLAG_PAIRWISE_RX_TX_MODIFY) < 0) {
 		wpa_msg(sm->ctx->msg_ctx, MSG_WARNING,
 			"WPA: Failed to activate PTK for TX (idx=%d bssid="

[06/12] MLD STA: Configure pairwise keys using MLD address

Commit Message

Comments

Patch