diff --git a/components/esp_wifi/Kconfig b/components/esp_wifi/Kconfig
index 6ca271eec4..fb3c05116e 100644
--- a/components/esp_wifi/Kconfig
+++ b/components/esp_wifi/Kconfig
@@ -368,7 +368,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 1e8aa2d658..df851621de 100644
--- a/components/esp_wifi/include/esp_wifi.h
+++ b/components/esp_wifi/include/esp_wifi.h
@@ -233,24 +233,32 @@ extern const wpa_crypto_funcs_t g_wifi_default_wpa_crypto_funcs;
 #define WIFI_FTM_RESPONDER 0
 #endif
 
-#if CONFIG_GCMP
+#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
+
 #define CONFIG_FEATURE_WPA3_SAE_BIT     (1<<0)
 #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_ENABLE_GCMP)
+                           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 30a9ad2f97..50f5dc6d1b 160000
--- a/components/esp_wifi/lib
+++ b/components/esp_wifi/lib
@@ -1 +1 @@
-Subproject commit 30a9ad2f976d847abc6f0093725b480e52d98425
+Subproject commit 50f5dc6d1b7e662f553dde3cf28d3d6ac9a89d6b
diff --git a/components/wpa_supplicant/src/crypto/crypto_ops.c b/components/wpa_supplicant/src/crypto/crypto_ops.c
index 128af4e1ae..7a867c88e9 100644
--- a/components/wpa_supplicant/src/crypto/crypto_ops.c
+++ b/components/wpa_supplicant/src/crypto/crypto_ops.c
@@ -42,7 +42,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
 }