[PATCH v6a 7/7] Fixes for wpa_supplicant: FILS Extended Key ID support

Alexander Wetzel alexander at wetzel-home.de
Sat Sep 28 11:18:07 PDT 2019


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 at wetzel-home.de>
---
 src/ap/wpa_auth_ft.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

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;
 
-- 
2.23.0




More information about the Hostap mailing list