hostapd: CVE-2014-3686 fixes
[openwrt/openwrt.git] / package / network / services / hostapd / patches / 470-hostapd_cli_ifdef.patch
1 --- a/hostapd/hostapd_cli.c
2 +++ b/hostapd/hostapd_cli.c
3 @@ -67,7 +67,6 @@ static const char *commands_help =
4 #ifdef CONFIG_IEEE80211W
5 " sa_query <addr> send SA Query to a station\n"
6 #endif /* CONFIG_IEEE80211W */
7 -#ifdef CONFIG_WPS
8 " wps_pin <uuid> <pin> [timeout] [addr] add WPS Enrollee PIN\n"
9 " wps_check_pin <PIN> verify PIN checksum\n"
10 " wps_pbc indicate button pushed to initiate PBC\n"
11 @@ -80,7 +79,6 @@ static const char *commands_help =
12 " wps_ap_pin <cmd> [params..] enable/disable AP PIN\n"
13 " wps_config <SSID> <auth> <encr> <key> configure AP\n"
14 " wps_get_status show current WPS status\n"
15 -#endif /* CONFIG_WPS */
16 " get_config show current configuration\n"
17 " help show this usage help\n"
18 " interface [ifname] show interfaces/select interface\n"
19 @@ -353,7 +351,6 @@ static int hostapd_cli_cmd_sa_query(stru
20 #endif /* CONFIG_IEEE80211W */
21
22
23 -#ifdef CONFIG_WPS
24 static int hostapd_cli_cmd_wps_pin(struct wpa_ctrl *ctrl, int argc,
25 char *argv[])
26 {
27 @@ -579,7 +576,6 @@ static int hostapd_cli_cmd_wps_config(st
28 ssid_hex, argv[1]);
29 return wpa_ctrl_command(ctrl, buf);
30 }
31 -#endif /* CONFIG_WPS */
32
33
34 static int hostapd_cli_cmd_disassoc_imminent(struct wpa_ctrl *ctrl, int argc,
35 @@ -970,7 +966,6 @@ static struct hostapd_cli_cmd hostapd_cl
36 #ifdef CONFIG_IEEE80211W
37 { "sa_query", hostapd_cli_cmd_sa_query },
38 #endif /* CONFIG_IEEE80211W */
39 -#ifdef CONFIG_WPS
40 { "wps_pin", hostapd_cli_cmd_wps_pin },
41 { "wps_check_pin", hostapd_cli_cmd_wps_check_pin },
42 { "wps_pbc", hostapd_cli_cmd_wps_pbc },
43 @@ -984,7 +979,6 @@ static struct hostapd_cli_cmd hostapd_cl
44 { "wps_ap_pin", hostapd_cli_cmd_wps_ap_pin },
45 { "wps_config", hostapd_cli_cmd_wps_config },
46 { "wps_get_status", hostapd_cli_cmd_wps_get_status },
47 -#endif /* CONFIG_WPS */
48 { "disassoc_imminent", hostapd_cli_cmd_disassoc_imminent },
49 { "ess_disassoc", hostapd_cli_cmd_ess_disassoc },
50 { "get_config", hostapd_cli_cmd_get_config },