aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAshok Ponnaiah <aponnaia@qti.qualcomm.com>2017-11-27 11:20:58 (GMT)
committerJouni Malinen <j@w1.fi>2017-11-27 15:30:03 (GMT)
commitdc2f24f1b2cbc6f08f58016b52889e2476e66d79 (patch)
tree90d9a3b054133b67939633548f89bc20a55cb6fb
parent82feacced044b202826e9eb3b8437f06b89c2848 (diff)
downloadhostap-dc2f24f1b2cbc6f08f58016b52889e2476e66d79.zip
hostap-dc2f24f1b2cbc6f08f58016b52889e2476e66d79.tar.gz
hostap-dc2f24f1b2cbc6f08f58016b52889e2476e66d79.tar.bz2
DPP: Fix compilation without CONFIG_TESTING_OPTIONS=y
Add CONFIG_TESTING_OPTIONS ifdef protection to couple of forgotten DPP test parameters in wpa_supplicant ctrl_iface. Signed-off-by: Ashok Ponnaiah <aponnaia@qti.qualcomm.com>
-rw-r--r--wpa_supplicant/ctrl_iface.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/wpa_supplicant/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c
index de9d625..a6d41e4 100644
--- a/wpa_supplicant/ctrl_iface.c
+++ b/wpa_supplicant/ctrl_iface.c
@@ -615,6 +615,7 @@ static int wpa_supplicant_ctrl_iface_set(struct wpa_supplicant *wpa_s,
wpa_s->dpp_resp_max_tries = atoi(value);
} else if (os_strcasecmp(cmd, "dpp_resp_retry_time") == 0) {
wpa_s->dpp_resp_retry_time = atoi(value);
+#ifdef CONFIG_TESTING_OPTIONS
} else if (os_strcasecmp(cmd, "dpp_pkex_own_mac_override") == 0) {
if (hwaddr_aton(value, dpp_pkex_own_mac_override))
ret = -1;
@@ -632,6 +633,7 @@ static int wpa_supplicant_ctrl_iface_set(struct wpa_supplicant *wpa_s,
ret = -1;
else
dpp_pkex_ephemeral_key_override_len = hex_len / 2;
+#endif /* CONFIG_TESTING_OPTIONS */
#endif /* CONFIG_DPP */
#ifdef CONFIG_TESTING_OPTIONS
} else if (os_strcasecmp(cmd, "ext_mgmt_frame_handling") == 0) {
@@ -7778,9 +7780,11 @@ static void wpa_supplicant_ctrl_iface_flush(struct wpa_supplicant *wpa_s)
wpa_s->dpp_resp_wait_time = 0;
wpa_s->dpp_resp_max_tries = 0;
wpa_s->dpp_resp_retry_time = 0;
+#ifdef CONFIG_TESTING_OPTIONS
os_memset(dpp_pkex_own_mac_override, 0, ETH_ALEN);
os_memset(dpp_pkex_peer_mac_override, 0, ETH_ALEN);
dpp_pkex_ephemeral_key_override_len = 0;
+#endif /* CONFIG_TESTING_OPTIONS */
#endif /* CONFIG_DPP */
#ifdef CONFIG_TDLS