[v3,13/17] wpa_supplicant: FILS Extended Key ID support

Message ID	20190817211435.158335-14-alexander@wetzel-home.de
State	Superseded
Headers	show Return-Path: <hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org> sender: postmaster@awhome.eu) by player158.ha.ovh.net (Postfix) with ESMTPSA id 4FBA88CE9A03; Sat, 17 Aug 2019 21:14:56 +0000 (UTC) From: Alexander Wetzel <alexander@wetzel-home.de> To: j@w1.fi Subject: [PATCH v3 13/17] wpa_supplicant: FILS Extended Key ID support Date: Sat, 17 Aug 2019 23:14:31 +0200 Message-Id: <20190817211435.158335-14-alexander@wetzel-home.de> In-Reply-To: <20190817211435.158335-1-alexander@wetzel-home.de> References: <20190817211435.158335-1-alexander@wetzel-home.de> MIME-Version: 1.0 summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [46.105.74.148 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 Cc: Alexander Wetzel <alexander@wetzel-home.de>, hostap@lists.infradead.org, luca@coelho.fi, johannes@sipsolutions.net 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	Support seamless PTK rekeys with Extended Key ID \| expand [v3,00/17] Support seamless PTK rekeys with Extended Key ID [v3,01/17] nl80211: Migrate to current netlink key message format [v3,02/17] Driver: Introduce key_types and Extended Key ID driver flag [v3,03/17] Add new argument key_type to all set_key() functions [v3,04/17] hostapd: Set the correct key_type for key installs [v3,05/17] wpa_supplicant: Set the correct key_type for key installs [v3,06/17] drivers: Migrate drivers from set_tx to key_type API [v3,07/17] nl80211: Switch to the new key_type API & cleanup [v3,08/17] nl80211,wpa_supplicant: Drop outdated tdls hack [v3,09/17] hostapd: Add support for Extended Key ID [v3,10/17] wpa_supplicant: Extended Key ID support for AP connections [v3,11/17] tests: Extended Key ID tests [v3,12/17] hostapd: FILS Extended Key ID support [v3,13/17] wpa_supplicant: FILS Extended Key ID support [v3,14/17] nl80211: Extended Key ID support [v3,15/17] nl80211: Hack for keyidx=1 installs [v3,16/17] Drop set_tx from all set_key() functions [v3,17/17] hostapd: Extended Key ID stress test

Message ID

20190817211435.158335-14-alexander@wetzel-home.de

State

Superseded

Headers

From: Alexander Wetzel <alexander@wetzel-home.de>
To: j@w1.fi
Subject: [PATCH v3 13/17] wpa_supplicant: FILS Extended Key ID support
Date: Sat, 17 Aug 2019 23:14:31 +0200
Message-Id: <20190817211435.158335-14-alexander@wetzel-home.de>
In-Reply-To: <20190817211435.158335-1-alexander@wetzel-home.de>
References: <20190817211435.158335-1-alexander@wetzel-home.de>
MIME-Version: 1.0
Precedence: list
Cc: Alexander Wetzel <alexander@wetzel-home.de>, hostap@lists.infradead.org, 
	luca@coelho.fi, johannes@sipsolutions.net
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

Support seamless PTK rekeys with Extended Key ID | expand

Commit Message

Alexander Wetzel Aug. 17, 2019, 9:14 p.m. UTC

This implements the matching Extended Key ID support for FILS
compatible to our hostapd interpretation of the standard.

Signed-off-by: Alexander Wetzel <alexander@wetzel-home.de>
---
 src/rsn_supp/wpa.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/rsn_supp/wpa.c b/src/rsn_supp/wpa.c
index 32114a9d2..49b63ba22 100644
--- a/src/rsn_supp/wpa.c
+++ b/src/rsn_supp/wpa.c
@@ -4382,6 +4382,7 @@  int fils_process_assoc_resp(struct wpa_sm *sm, const u8 *resp, size_t len)
 	struct wpa_gtk_data gd;
 	int maxkeylen;
 	struct wpa_eapol_ie_parse kde;
+	struct wpa_ie_data rsn;
 
 	if (!sm || !sm->ptk_set) {
 		wpa_printf(MSG_DEBUG, "FILS: No KEK available");
@@ -4495,8 +4496,6 @@  int fils_process_assoc_resp(struct wpa_sm *sm, const u8 *resp, size_t len)
 
 #ifdef CONFIG_IEEE80211R
 	if (wpa_key_mgmt_ft(sm->key_mgmt) && sm->fils_ft_ies) {
-		struct wpa_ie_data rsn;
-
 		/* Check that PMKR1Name derived by the AP matches */
 		if (!elems.rsn_ie ||
 		    wpa_parse_wpa_ie_rsn(elems.rsn_ie - 2, elems.rsn_ie_len + 2,
@@ -4564,11 +4563,16 @@  int fils_process_assoc_resp(struct wpa_sm *sm, const u8 *resp, size_t len)
 			   keylen, (long unsigned int) sm->ptk.tk_len);
 		goto fail;
 	}
+
+	if (handle_extended_key_id(sm, &kde,
+				   elems.rsn_ie - 2, elems.rsn_ie_len + 2))
+		goto fail;
+
 	rsclen = wpa_cipher_rsc_len(sm->pairwise_cipher);
 	wpa_hexdump_key(MSG_DEBUG, "FILS: Set TK to driver",
 			sm->ptk.tk, keylen);
-	if (wpa_sm_set_key(sm, alg, sm->bssid, 0, 1, null_rsc, rsclen,
-			   sm->ptk.tk, keylen, KEY_TYPE_PAIRWISE) < 0) {
+	if (wpa_sm_set_key(sm, alg, sm->bssid, sm->keyidx_active, 1, null_rsc,
+			   rsclen, sm->ptk.tk, keylen, KEY_TYPE_PAIRWISE) < 0) {
 		wpa_msg(sm->ctx->msg_ctx, MSG_WARNING,
 			"FILS: Failed to set PTK to the driver (alg=%d keylen=%d bssid="
 			MACSTR ")",

[v3,13/17] wpa_supplicant: FILS Extended Key ID support

Commit Message

Patch