[45/50] AP: Use MLD address for SAE commit derivation

Message ID	20230215230904.933291-46-andrei.otcheretianski@intel.com
State	Changes Requested
Headers	show Return-Path: <hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org> From: Andrei Otcheretianski <andrei.otcheretianski@intel.com> To: hostap@lists.infradead.org Cc: Andrei Otcheretianski <andrei.otcheretianski@intel.com> Subject: [PATCH 45/50] AP: Use MLD address for SAE commit derivation Date: Thu, 16 Feb 2023 01:08:59 +0200 Message-Id: <20230215230904.933291-46-andrei.otcheretianski@intel.com> In-Reply-To: <20230215230904.933291-1-andrei.otcheretianski@intel.com> References: <20230215230904.933291-1-andrei.otcheretianski@intel.com> MIME-Version: 1.0 preview: Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com> --- src/ap/ieee802_11.c \| 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c index c302f01804..3af86e6df8 100644 --- a/src/ap/ieee802_11.c +++ b/src/ap/ieee802_11.c @@ -600,12 +600,18 @@ static struct wpabuf * auth_build_s [...] Content analysis details: (-2.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 [134.134.136.65 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 SPF_NONE SPF: sender 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 -0.2 DKIMWL_WL_HIGH DKIMwl.org - High trust sender 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	Add basic MLO support for AP \| expand [00/50] Add basic MLO support for AP [01/50] nl80211: Refactor i802_bss to support multiple links [02/50] driver_nl80211: Introduce and implement a callback to add MLO link [03/50] driver: Add MLD link id to AP parameters [04/50] driver: Allow to provide a link ID when setting a channel [05/50] driver_nl80211: Provide link_id in EAPOL_RX and RX_MGMT events [06/50] driver_nl80211: Support setting up an AP on a specified link [07/50] driver_nl80211: Properly stop and deinit MLO AP [08/50] AP: Add some basic MLD configuration options [09/50] AP: Allow starting multiple interfaces within single MLD [10/50] AP: Include an RNR element in beacons for MLD AP [11/50] driver_nl80211: Select freq according to transmitting link [12/50] nl80211: Support adding multi link stations [13/50] common: Split ieee8021_parse_elems() [14/50] common: Add support for clearing elements [15/50] common: Support parsing link specific association request [16/50] AP: Split check_assoc_ies() [17/50] AP: MLO: Make 802.1X SM, authserv and radius client singletons [18/50] AP: Match Rx frames against MLD address [19/50] AP: Support building basic Multi-Link Element [20/50] AP: MLO: Handle ML element during authentication [21/50] AP: MLO: Add MLO information to hostapd_sta_add_params struct [22/50] AP: MLO: Process EHT ML element from association request [23/50] AP: MLO: Add ML element to association response [24/50] AP: MLO: Handle association callback [25/50] AP: MLO: Handle deauth/disassoc of MLD station [26/50] AP: MLO: Handle 802.1X port authorization [27/50] driver: Specify link ID for 'send_mlme' and 'sta_deauth' callbacks [28/50] AP: Do not prune station when adding a link station [29/50] AP: Handle TX status for MLD AP [30/50] AP: Print MLD info in STATUS command [31/50] AP/wpa_supplicant/driver: Add link id to send eapol callbacks [32/50] AP: Provide the link ID for an MLD setting when setting VLAN [33/50] AP/driver: Add link id to the set_tx_queue_params() callback [34/50] driver_nl80211: use frequency to determine mld link for MLME events [35/50] AP: Forward link specific events [36/50] WPA_AUTH: MLO: Add functions to get the AA and SPA [37/50] WPA_AUTH: MLO: Store MLO link information [38/50] WPA_AUTH: MLO: Add MAC KDE to 1st message in 4-way handshake [39/50] WPA_AUTH: MLO: Validate MLO KDEs in 2nd message of 4-way handshake [40/50] WPA_AUTH: MLO: Add MLO KDEs to message 3 of the 4-way handshake [41/50] WPA_AUTH: MLO: Validate MLO KDEs in 4th message of 4-way handshake [42/50] WPA_AUTH: MLO: Add MLO KDEs to message 1 of the group handshake [43/50] WPA_AUTH: MLO: Get the correct AA and SPA based on MLD operation [44/50] AP: Specify the link ID for set_key() callback [45/50] AP: Use MLD address for SAE commit derivation [46/50] AP: Don't process SAE/OWE assoc info on MLD links [47/50] AP: Use MLD address for traffic tests [48/50] tests: Clear sae_groups in eht_sae test [49/50] tests: Remove dynamically added hostapd interfaces [50/50] tests: Add basic MLD hwsim tests

Message ID

20230215230904.933291-46-andrei.otcheretianski@intel.com

State

Changes Requested

Headers

From: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
To: hostap@lists.infradead.org
Cc: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
Subject: [PATCH 45/50] AP: Use MLD address for SAE commit derivation
Date: Thu, 16 Feb 2023 01:08:59 +0200
Message-Id: <20230215230904.933291-46-andrei.otcheretianski@intel.com>
In-Reply-To: <20230215230904.933291-1-andrei.otcheretianski@intel.com>
References: <20230215230904.933291-1-andrei.otcheretianski@intel.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

Add basic MLO support for AP | expand

Commit Message

Andrei Otcheretianski Feb. 15, 2023, 11:08 p.m. UTC

Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
---
 src/ap/ieee802_11.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c
index c302f01804..3af86e6df8 100644
--- a/src/ap/ieee802_11.c
+++ b/src/ap/ieee802_11.c
@@ -600,12 +600,18 @@  static struct wpabuf * auth_build_sae_commit(struct hostapd_data *hapd,
 	int use_pt = 0;
 	struct sae_pt *pt = NULL;
 	const struct sae_pk *pk = NULL;
+	u8 *own_addr = hapd->own_addr;
+
+#ifdef CONFIG_IEEE80211BE
+	if (hapd->conf->mld_ap && sta->mld_info.mld_sta)
+		own_addr = hapd->mld_addr;
+#endif
 
 	if (sta->sae->tmp) {
 		rx_id = sta->sae->tmp->pw_id;
 		use_pt = sta->sae->h2e;
 #ifdef CONFIG_SAE_PK
-		os_memcpy(sta->sae->tmp->own_addr, hapd->own_addr, ETH_ALEN);
+		os_memcpy(sta->sae->tmp->own_addr, own_addr, ETH_ALEN);
 		os_memcpy(sta->sae->tmp->peer_addr, sta->addr, ETH_ALEN);
 #endif /* CONFIG_SAE_PK */
 	}
@@ -625,12 +631,12 @@  static struct wpabuf * auth_build_sae_commit(struct hostapd_data *hapd,
 	}
 
 	if (update && use_pt &&
-	    sae_prepare_commit_pt(sta->sae, pt, hapd->own_addr, sta->addr,
+	    sae_prepare_commit_pt(sta->sae, pt, own_addr, sta->addr,
 				  NULL, pk) < 0)
 		return NULL;
 
 	if (update && !use_pt &&
-	    sae_prepare_commit(hapd->own_addr, sta->addr,
+	    sae_prepare_commit(own_addr, sta->addr,
 			       (u8 *) password, os_strlen(password),
 			       sta->sae) < 0) {
 		wpa_printf(MSG_DEBUG, "SAE: Could not pick PWE");

[45/50] AP: Use MLD address for SAE commit derivation

Commit Message

Patch