WPS: Add a workaround for Windows 7 capability discovery for PBC

[thirdparty/hostap.git] / src / wps / wps_enrollee.c

diff --git a/src/wps/wps_enrollee.c b/src/wps/wps_enrollee.c
index 390254e438296549b8a78adad8a9ad0cacaf0f2b..5b3c0450be4e468f98e391e5b91ef77dc89fe192 100644 (file)
--- a/src/wps/wps_enrollee.c
+++ b/src/wps/wps_enrollee.c
@@ -133,10 +133,17 @@ static struct wpabuf * wps_build_m1(struct wps_data *wps)
                return NULL;
 
        config_methods = wps->wps->config_methods;
-       if (wps->wps->ap) {
+       if (wps->wps->ap && !wps->pbc_in_m1 &&
+           (wps->dev_password_len != 0 ||
+            (config_methods & WPS_CONFIG_DISPLAY))) {
                /*
                 * These are the methods that the AP supports as an Enrollee
                 * for adding external Registrars, so remove PushButton.
+                *
+                * As a workaround for Windows 7 mechanism for probing WPS
+                * capabilities from M1, leave PushButton option if no PIN
+                * method is available or if WPS configuration enables PBC
+                * workaround.
                 */
                config_methods &= ~WPS_CONFIG_PUSHBUTTON;
 #ifdef CONFIG_WPS2