jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

WPS: Fix M2/M2D Config Methods to include PushButton even if PBC not in use

Browse source 
The Config Methods attribute in M2 and M2D messages is supposed to
indicate which configuration methods are supported by the Registrar. As
such, it should not depend on whether PBC mode is currently active or
not. That will only affect the Selected Registrar Config Methods and
Device Password ID attributes.
This commit is contained in:
Jouni Malinen 2011-08-11 17:03:57 +03:00 committed by Jouni Malinen
parent 59639fa112
commit 167dc97501
1 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/wps/wps_registrar.c
View file

@ -547,15 +547,7 @@ static int wps_build_probe_config_methods(struct wps_registrar *reg,
static int wps_build_config_methods_r(struct wps_registrar *reg,
struct wpabuf *msg)
{
u16 methods;
methods = reg->wps->config_methods & ~WPS_CONFIG_PUSHBUTTON;
#ifdef CONFIG_WPS2
methods &= ~(WPS_CONFIG_VIRT_PUSHBUTTON |
WPS_CONFIG_PHY_PUSHBUTTON);
#endif /* CONFIG_WPS2 */
if (reg->pbc)
wps_set_pushbutton(&methods, reg->wps->config_methods);
return wps_build_config_methods(msg, methods);
return wps_build_config_methods(msg, reg->wps->config_methods);
}