aboutsummaryrefslogtreecommitdiffstats
path: root/wpa_supplicant
diff options
context:
space:
mode:
authorJouni Malinen <jouni@qca.qualcomm.com>2017-08-22 20:46:27 (GMT)
committerJouni Malinen <j@w1.fi>2017-08-22 20:46:27 (GMT)
commita4bf007877576ab91ef1cf9b97aa5df62e233496 (patch)
treefe9233e9eff200c9973f197a2c059acb0cfccc54 /wpa_supplicant
parentd1888b142eedf074059ddc020390cf12ae563347 (diff)
downloadhostap-a4bf007877576ab91ef1cf9b97aa5df62e233496.zip
hostap-a4bf007877576ab91ef1cf9b97aa5df62e233496.tar.gz
hostap-a4bf007877576ab91ef1cf9b97aa5df62e233496.tar.bz2
DPP: Remove devices object from the connector
This was removed from the draft DPP tech spec, so remove it from the implementation as well. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Diffstat (limited to 'wpa_supplicant')
-rw-r--r--wpa_supplicant/ctrl_iface.c3
-rw-r--r--wpa_supplicant/dpp_supplicant.c5
-rw-r--r--wpa_supplicant/wpa_supplicant_i.h1
3 files changed, 0 insertions, 9 deletions
diff --git a/wpa_supplicant/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c
index 863dc99..62b1baf 100644
--- a/wpa_supplicant/ctrl_iface.c
+++ b/wpa_supplicant/ctrl_iface.c
@@ -646,9 +646,6 @@ static int wpa_supplicant_ctrl_iface_set(struct wpa_supplicant *wpa_s,
} else if (os_strcasecmp(cmd, "dpp_groups_override") == 0) {
os_free(wpa_s->dpp_groups_override);
wpa_s->dpp_groups_override = os_strdup(value);
- } else if (os_strcasecmp(cmd, "dpp_devices_override") == 0) {
- os_free(wpa_s->dpp_devices_override);
- wpa_s->dpp_devices_override = os_strdup(value);
} else if (os_strcasecmp(cmd,
"dpp_ignore_netaccesskey_mismatch") == 0) {
wpa_s->dpp_ignore_netaccesskey_mismatch = atoi(value);
diff --git a/wpa_supplicant/dpp_supplicant.c b/wpa_supplicant/dpp_supplicant.c
index 7acb44f..4d632b3 100644
--- a/wpa_supplicant/dpp_supplicant.c
+++ b/wpa_supplicant/dpp_supplicant.c
@@ -366,9 +366,6 @@ static void wpas_dpp_set_testing_options(struct wpa_supplicant *wpa_s,
if (wpa_s->dpp_groups_override)
auth->groups_override =
os_strdup(wpa_s->dpp_groups_override);
- if (wpa_s->dpp_devices_override)
- auth->devices_override =
- os_strdup(wpa_s->dpp_devices_override);
auth->ignore_netaccesskey_mismatch =
wpa_s->dpp_ignore_netaccesskey_mismatch;
#endif /* CONFIG_TESTING_OPTIONS */
@@ -2039,8 +2036,6 @@ void wpas_dpp_deinit(struct wpa_supplicant *wpa_s)
wpa_s->dpp_discovery_override = NULL;
os_free(wpa_s->dpp_groups_override);
wpa_s->dpp_groups_override = NULL;
- os_free(wpa_s->dpp_devices_override);
- wpa_s->dpp_devices_override = NULL;
wpa_s->dpp_ignore_netaccesskey_mismatch = 0;
#endif /* CONFIG_TESTING_OPTIONS */
if (!wpa_s->dpp_init_done)
diff --git a/wpa_supplicant/wpa_supplicant_i.h b/wpa_supplicant/wpa_supplicant_i.h
index 8b7d2f5..61ea5ee 100644
--- a/wpa_supplicant/wpa_supplicant_i.h
+++ b/wpa_supplicant/wpa_supplicant_i.h
@@ -1193,7 +1193,6 @@ struct wpa_supplicant {
char *dpp_config_obj_override;
char *dpp_discovery_override;
char *dpp_groups_override;
- char *dpp_devices_override;
unsigned int dpp_ignore_netaccesskey_mismatch:1;
#endif /* CONFIG_TESTING_OPTIONS */
#endif /* CONFIG_DPP */