Amazing-Mirror/fragattacks
1
0
Fork 0
mirror of https://github.com/vanhoefm/fragattacks.git synced 2024-11-25 08:48:31 -05:00
Code Issues Projects Releases Wiki Activity

WPS: Remove PushButton from M1 ConfigMethods on AP

Browse Source 
These config methods are for the Enrollee role, i.e., for adding
external Registrars, and as such, PushButton should not be claimed
to be supported.
This commit is contained in:
Jouni Malinen 2010-11-04 17:29:48 +02:00 committed by Jouni Malinen
parent 6e1468839c
commit c7c0ddfd91
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/wps/wps_enrollee.c
View File

@ -119,6 +119,7 @@ static int wps_build_e_snonce2(struct wps_data *wps, struct wpabuf *msg)
static struct wpabuf * wps_build_m1(struct wps_data *wps) static struct wpabuf * wps_build_m1(struct wps_data *wps)
{ {
struct wpabuf *msg; struct wpabuf *msg;
u16 config_methods;
if (os_get_random(wps->nonce_e, WPS_NONCE_LEN) < 0) if (os_get_random(wps->nonce_e, WPS_NONCE_LEN) < 0)
return NULL; return NULL;
@ -130,6 +131,19 @@ static struct wpabuf * wps_build_m1(struct wps_data *wps)
if (msg == NULL) if (msg == NULL)
return NULL; return NULL;
config_methods = wps->wps->config_methods;
if (wps->wps->ap) {
/*
* These are the methods that the AP supports as an Enrollee
* for adding external Registrars, so remove PushButton.
*/
config_methods &= ~WPS_CONFIG_PUSHBUTTON;
#ifdef CONFIG_WPS2
config_methods &= ~(WPS_CONFIG_VIRT_PUSHBUTTON |
WPS_CONFIG_PHY_PUSHBUTTON);
#endif /* CONFIG_WPS2 */
}
if (wps_build_version(msg) || if (wps_build_version(msg) ||
wps_build_msg_type(msg, WPS_M1) || wps_build_msg_type(msg, WPS_M1) ||
wps_build_uuid_e(msg, wps->uuid_e) || wps_build_uuid_e(msg, wps->uuid_e) ||
@ -139,7 +153,7 @@ static struct wpabuf * wps_build_m1(struct wps_data *wps)
wps_build_auth_type_flags(wps, msg) || wps_build_auth_type_flags(wps, msg) ||
wps_build_encr_type_flags(wps, msg) || wps_build_encr_type_flags(wps, msg) ||
wps_build_conn_type_flags(wps, msg) || wps_build_conn_type_flags(wps, msg) ||
wps_build_config_methods(msg, wps->wps->config_methods) || wps_build_config_methods(msg, config_methods) ||
wps_build_wps_state(wps, msg) || wps_build_wps_state(wps, msg) ||
wps_build_device_attrs(&wps->wps->dev, msg) || wps_build_device_attrs(&wps->wps->dev, msg) ||
wps_build_rf_bands(&wps->wps->dev, msg) || wps_build_rf_bands(&wps->wps->dev, msg) ||