diff options
| author | Hai Shalom <haishalom@google.com> | 2019-11-05 16:20:12 -0800 |
|---|---|---|
| committer | Hai Shalom <haishalom@google.com> | 2019-11-06 12:54:34 -0800 |
| commit | e407333c1932a6c09069a3a2b6e77254dbc56a4c (patch) | |
| tree | 083dc1a8bc7cfadb1fafe4e33e29e338b1d1a273 | |
| parent | 1dcd239b880a41631f7840d25fa38c487410bc16 (diff) | |
| download | wpa_supplicant_8-e407333c1932a6c09069a3a2b6e77254dbc56a4c.tar.gz | |
[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
| -rw-r--r-- | wpa_supplicant/android.config | 3 | ||||
| -rw-r--r-- | wpa_supplicant/dpp_supplicant.c | 8 |
2 files changed, 8 insertions, 3 deletions
diff --git a/wpa_supplicant/android.config b/wpa_supplicant/android.config index ad3af403..7f9306b3 100644 --- a/wpa_supplicant/android.config +++ b/wpa_supplicant/android.config @@ -535,8 +535,9 @@ CONFIG_WIFI_DISPLAY=y # 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 ff30e9ac..dee8e28a 100644 --- a/wpa_supplicant/dpp_supplicant.c +++ b/wpa_supplicant/dpp_supplicant.c @@ -1500,10 +1500,14 @@ static void wpas_dpp_rx_conf_result(struct wpa_supplicant *wpa_s, const u8 *src, } 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); |