[v6a,7/7] Fixes for wpa_supplicant: FILS Extended Key ID support
diff mbox series

Message ID 20190928181807.180530-8-alexander@wetzel-home.de
State New
Headers show
Series
  • Fixes for Extended Key ID patch series V6
Related show

Commit Message

Alexander Wetzel Sept. 28, 2019, 6:18 p.m. UTC
This is a correction on top of:
[PATCH v6 14/17] wpa_supplicant: FILS Extended Key ID support

Changes:
 - move handle_extended_key_id() call, so sm->pairwise is set when the
   function is called.
Signed-off-by: Alexander Wetzel <alexander@wetzel-home.de>
---
 src/ap/wpa_auth_ft.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

Comments

Alexander Wetzel Sept. 30, 2019, 6:53 p.m. UTC | #1
> This is a correction on top of:
> [PATCH v6 14/17] wpa_supplicant: FILS Extended Key ID support

I referenced the wrong patch. The patched files belong to hostapd and 
therefore this is a correction on top of:
  [PATCH v6 13/17] hostapd: FILS Extended Key ID support

I've fixed that in the the full patchset I'm providing here:
https://www.awhome.eu/index.php/s/o5m9Q29n37zbEga
but sending it around here looks like overkill.

The Folder V7 still has the original files, V7-1 has this fixed.

Alexander

P.s.
I will probably not able to respond to questions/feedback for about one 
week after tomorrow.

Alexander

Patch
diff mbox series

diff --git a/src/ap/wpa_auth_ft.c b/src/ap/wpa_auth_ft.c
index 6afefe983..f242fc508 100644
--- a/src/ap/wpa_auth_ft.c
+++ b/src/ap/wpa_auth_ft.c
@@ -2775,8 +2775,7 @@  static int wpa_ft_set_key_mgmt(struct wpa_state_machine *sm,
 		return -1;
 	}
 	sm->pairwise = wpa_pick_pairwise_cipher(ciphers, 0);
-
-	return 0;
+	return handle_extended_key_id(sm, parse->capabilities);
 }
 
 
@@ -2888,9 +2887,6 @@  static int wpa_ft_process_auth_req(struct wpa_state_machine *sm,
 		return WLAN_STATUS_UNSPECIFIED_FAILURE;
 	}
 
-	if (handle_extended_key_id(sm, parse.capabilities))
-		return WLAN_STATUS_UNSPECIFIED_FAILURE;
-
 	use_sha384 = wpa_key_mgmt_sha384(parse.key_mgmt);
 	pmk_r1_len = use_sha384 ? SHA384_MAC_LEN : PMK_LEN;