Merge "AIDL: Use sae_password for SAE network when available with DPP configuration." into main
diff --git a/wpa_supplicant/aidl/vendor/aidl_manager.cpp b/wpa_supplicant/aidl/vendor/aidl_manager.cpp
index 60ce800..24e5a56 100644
--- a/wpa_supplicant/aidl/vendor/aidl_manager.cpp
+++ b/wpa_supplicant/aidl/vendor/aidl_manager.cpp
@@ -1866,7 +1866,11 @@
return;
}
- aidl_dpp_config_data.password = misc_utils::charBufToString(config->passphrase);
+ if (aidl_dpp_config_data.securityAkm == DppAkm::SAE)
+ aidl_dpp_config_data.password = misc_utils::charBufToString(config->sae_password);
+ else
+ aidl_dpp_config_data.password = misc_utils::charBufToString(config->passphrase);
+
aidl_dpp_config_data.psk = byteArrToVec(config->psk, 32);
std::vector<uint8_t> aidl_ssid(
config->ssid,