[wpa_supplicant] Enable DPP R2 support
Enable DPP R2 support in wpa_supplicant.
Bug: 143967086
Test: act.py -c ../WifiDppConfig.json -tc WifiDppTest
Change-Id: I5f72f8152e0212c92774251bf5cfb0b7f6d76ae9
diff --git a/wpa_supplicant/android.config b/wpa_supplicant/android.config
index ad3af40..7f9306b 100644
--- a/wpa_supplicant/android.config
+++ b/wpa_supplicant/android.config
@@ -535,8 +535,9 @@
# Experimental implementation of draft-harkins-owe-07.txt
CONFIG_OWE=y
-# Easy Connect (Device Provisioning Protocol - DPP)
+# Easy Connect (Device Provisioning Protocol - DPP R1 and R2)
CONFIG_DPP=y
+CONFIG_DPP2=y
# WPA3-Personal (SAE)
CONFIG_SAE=y
diff --git a/wpa_supplicant/dpp_supplicant.c b/wpa_supplicant/dpp_supplicant.c
index ff30e9a..dee8e28 100644
--- a/wpa_supplicant/dpp_supplicant.c
+++ b/wpa_supplicant/dpp_supplicant.c
@@ -1500,10 +1500,14 @@
}
offchannel_send_action_done(wpa_s);
wpas_dpp_listen_stop(wpa_s);
- if (status == DPP_STATUS_OK)
+ if (status == DPP_STATUS_OK) {
wpa_msg(wpa_s, MSG_INFO, DPP_EVENT_CONF_SENT);
- else
+ wpas_notify_dpp_config_sent(wpa_s);
+ }
+ else {
wpa_msg(wpa_s, MSG_INFO, DPP_EVENT_CONF_FAILED);
+ wpas_notify_dpp_configuration_failure(wpa_s);
+ }
dpp_auth_deinit(auth);
wpa_s->dpp_auth = NULL;
eloop_cancel_timeout(wpas_dpp_config_result_wait_timeout, wpa_s, NULL);