[WPA3] WPA3-Enterprise fails to connect
Missing CONFIG_SUITEB in android.config and incorrect string
used for wpa_supplicant configuration, SUITE_B_192 instead of
SUITEB192.
Bug: 128628779
Test: Successfully connect to WPA3-Enterprise AP with 3072bit RSA certs
Change-Id: I5c94749ae9dfa273046581ac0fc46ea0379b7a60
diff --git a/wpa_supplicant/android.config b/wpa_supplicant/android.config
index feff916..6db380a 100644
--- a/wpa_supplicant/android.config
+++ b/wpa_supplicant/android.config
@@ -553,6 +553,7 @@
CONFIG_SAE=y
# WPA3-Enterprise (SuiteB-192)
+CONFIG_SUITEB=y
CONFIG_SUITEB192=y
include $(wildcard $(LOCAL_PATH)/android_config_*.inc)
diff --git a/wpa_supplicant/hidl/1.2/sta_network.cpp b/wpa_supplicant/hidl/1.2/sta_network.cpp
index 780c5a1..1b1ee48 100644
--- a/wpa_supplicant/hidl/1.2/sta_network.cpp
+++ b/wpa_supplicant/hidl/1.2/sta_network.cpp
@@ -1867,7 +1867,7 @@
SupplicantStatus StaNetwork::enableSuiteBEapOpenSslCiphersInternal()
{
struct wpa_ssid *wpa_ssid = retrieveNetworkPtr();
- const char openssl_suiteb_cipher[] = "SUITE_B_192";
+ const char openssl_suiteb_cipher[] = "SUITEB192";
if (setStringKeyFieldAndResetState(
openssl_suiteb_cipher, &(wpa_ssid->eap.openssl_ciphers),