From 7dbfd8c6dabf4032fbbf44dcd5e7b79148ceb5a5 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Mon, 9 Oct 2023 08:40:41 +0530 Subject: [PATCH] feat(wifi): Pull in wpa_supplicant upstream code for SAE EXT key SAE: Use wpa_key_mgmt_sae() helper Use the existing helper function instead of maintaining multiple copies of lists of SAE key management suites. Signed-off-by: Jouni Malinen --- components/wpa_supplicant/esp_supplicant/src/esp_wpas_glue.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/components/wpa_supplicant/esp_supplicant/src/esp_wpas_glue.c b/components/wpa_supplicant/esp_supplicant/src/esp_wpas_glue.c index 9a74c4e6b7..d3040b168e 100644 --- a/components/wpa_supplicant/esp_supplicant/src/esp_wpas_glue.c +++ b/components/wpa_supplicant/esp_supplicant/src/esp_wpas_glue.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2019-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2019-2023 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -97,7 +97,8 @@ void wpa_supplicant_transition_disable(struct wpa_sm *sm, u8 bitmap) { wpa_printf(MSG_DEBUG, "TRANSITION_DISABLE %02x", bitmap); - if (bitmap & TRANSITION_DISABLE_WPA3_PERSONAL) { + if ((bitmap & TRANSITION_DISABLE_WPA3_PERSONAL) && + wpa_key_mgmt_sae(sm->key_mgmt)) { esp_wifi_sta_disable_wpa2_authmode_internal(); } }