From e56cbd09b6a09b77c37aafa0085d65b78cc02272 Mon Sep 17 00:00:00 2001
From: "tarun.kumar" <tarun.kumar@espressif.com>
Date: Wed, 18 Feb 2026 13:03:32 +0530
Subject: [PATCH] fix(wifi) : Add ft enabled check for ft sae and added a
 separate check if AP doesnt include PMKID in 1/4 handshake message

    - Add a separate condition if AP doesnt include PMKID in FT-SAE for 1/4 handshake message
---
 components/esp_wifi/lib                      | 2 +-
 components/wpa_supplicant/src/rsn_supp/wpa.c | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib
index b9bc45aa8e..bb6d7baf16 160000
--- a/components/esp_wifi/lib
+++ b/components/esp_wifi/lib
@@ -1 +1 @@
-Subproject commit b9bc45aa8e98d53f8999f220a92286d9a57d4c1b
+Subproject commit bb6d7baf164bd240bdd34947c3961a7bc457e96b
diff --git a/components/wpa_supplicant/src/rsn_supp/wpa.c b/components/wpa_supplicant/src/rsn_supp/wpa.c
index 78ba0f015c..909dcb40df 100644
--- a/components/wpa_supplicant/src/rsn_supp/wpa.c
+++ b/components/wpa_supplicant/src/rsn_supp/wpa.c
@@ -412,6 +412,15 @@ static int wpa_supplicant_get_pmk(struct wpa_sm *sm,
         }
     }
 
+#ifdef CONFIG_WPA3_SAE
+#ifdef CONFIG_IEEE80211R
+    if (sm && sm->pmksa && (sm->key_mgmt == WPA_KEY_MGMT_FT_SAE)) {
+        os_memcpy(sm->xxkey, sm->pmk, sm->pmk_len);
+        sm->xxkey_len = sm->pmk_len;
+    }
+#endif
+#endif
+
     if (pmkid && sm->cur_pmksa &&
             os_memcmp_const(pmkid, sm->cur_pmksa->pmkid, PMKID_LEN) == 0) {