diff --git a/components/esp_wifi/Kconfig b/components/esp_wifi/Kconfig
index 1a69b8d6bd..67f268c8fd 100644
--- a/components/esp_wifi/Kconfig
+++ b/components/esp_wifi/Kconfig
@@ -406,7 +406,7 @@ menu "Wi-Fi"
 
         config ESP_WIFI_GMAC_SUPPORT
             bool "WiFi GMAC Support(GMAC128 and GMAC256)"
-            default n
+            default y
             help
                 Select this option to enable GMAC support. GMAC support is compulsory for WiFi 192 bit certification.
 
diff --git a/components/esp_wifi/include/esp_wifi.h b/components/esp_wifi/include/esp_wifi.h
index f56beb6c6e..b9589ad70d 100644
--- a/components/esp_wifi/include/esp_wifi.h
+++ b/components/esp_wifi/include/esp_wifi.h
@@ -242,6 +242,18 @@ extern wifi_osi_funcs_t g_wifi_osi_funcs;
 #define WIFI_FTM_RESPONDER 0
 #endif
 
+#if CONFIG_ESP_WIFI_GCMP_SUPPORT
+#define WIFI_ENABLE_GCMP (1<<4)
+#else
+#define WIFI_ENABLE_GCMP 0
+#endif
+
+#if CONFIG_ESP_WIFI_GMAC_SUPPORT
+#define WIFI_ENABLE_GMAC (1<<5)
+#else
+#define WIFI_ENABLE_GMAC 0
+#endif
+
 #if CONFIG_ESP_WIFI_ENABLE_DUMP_HESIGB && !WIFI_CSI_ENABLED
 #define WIFI_DUMP_HESIGB_ENABLED  true
 #else
@@ -258,12 +270,16 @@ extern wifi_osi_funcs_t g_wifi_osi_funcs;
 #define CONFIG_FEATURE_CACHE_TX_BUF_BIT (1<<1)
 #define CONFIG_FEATURE_FTM_INITIATOR_BIT (1<<2)
 #define CONFIG_FEATURE_FTM_RESPONDER_BIT (1<<3)
+#define CONFIG_FEATURE_GCMP_BIT (1<<4)
+#define CONFIG_FEATURE_GMAC_BIT (1<<5)
 
 /* Set additional WiFi features and capabilities */
 #define WIFI_FEATURE_CAPS (WIFI_ENABLE_WPA3_SAE | \
                            WIFI_ENABLE_SPIRAM  | \
                            WIFI_FTM_INITIATOR | \
-                           WIFI_FTM_RESPONDER)
+                           WIFI_FTM_RESPONDER | \
+                           WIFI_ENABLE_GCMP | \
+                           WIFI_ENABLE_GMAC)
 
 #define WIFI_INIT_CONFIG_DEFAULT() { \
     .osi_funcs = &g_wifi_osi_funcs, \
diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib
index fff3460aaf..70c2d7f46d 160000
--- a/components/esp_wifi/lib
+++ b/components/esp_wifi/lib
@@ -1 +1 @@
-Subproject commit fff3460aafdcfef2d1890caa80c1855eb5fac327
+Subproject commit 70c2d7f46d65a1b7904ce968e6b63a51acfc0745
diff --git a/components/wpa_supplicant/src/crypto/crypto_ops.c b/components/wpa_supplicant/src/crypto/crypto_ops.c
index 17c052c986..7b3f31a148 100644
--- a/components/wpa_supplicant/src/crypto/crypto_ops.c
+++ b/components/wpa_supplicant/src/crypto/crypto_ops.c
@@ -43,7 +43,7 @@ static int esp_aes_gmac(const u8 *key, size_t key_len, const u8 *iv, size_t iv_l
 #if CONFIG_GMAC
 	return aes_gmac(key, key_len, iv, iv_len, aad, aad_len, tag);
 #else
-	return 0;
+	return -1;
 #endif
 }