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

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.

diff --git a/src/wps/wps_registrar.c b/src/wps/wps_registrar.c
index 0626214..c822142 100644 (file)
--- a/src/wps/wps_registrar.c
+++ b/src/wps/wps_registrar.c
@@ -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);
 }