WPS: Enable WSC 2.0 support unconditionally

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

diff --git a/src/wps/wps.c b/src/wps/wps.c
index b40a68aeb73f71e52f8b609c2f63f29ceb3e6dda..648cfd10f60885e835e3683debbc2ad93710b466 100644 (file)
--- a/src/wps/wps.c
+++ b/src/wps/wps.c
@@ -18,6 +18,7 @@
 #ifdef CONFIG_WPS_TESTING
 int wps_version_number = 0x20;
 int wps_testing_dummy_cred = 0;
+int wps_corrupt_pkhash = 0;
 #endif /* CONFIG_WPS_TESTING */
 
 
@@ -510,13 +511,11 @@ struct wpabuf * wps_build_probe_req_ie(u16 pw_id, struct wps_device_data *dev,
            wps_build_assoc_state(NULL, ie) ||
            wps_build_config_error(ie, WPS_CFG_NO_ERROR) ||
            wps_build_dev_password_id(ie, pw_id) ||
-#ifdef CONFIG_WPS2
            wps_build_manufacturer(dev, ie) ||
            wps_build_model_name(dev, ie) ||
            wps_build_model_number(dev, ie) ||
            wps_build_dev_name(dev, ie) ||
            wps_build_wfa_ext(ie, req_type == WPS_REQ_ENROLLEE, NULL, 0) ||
-#endif /* CONFIG_WPS2 */
            wps_build_req_dev_type(dev, ie, num_req_dev_types, req_dev_types)
            ||
            wps_build_secondary_dev_type(dev, ie)
@@ -525,13 +524,6 @@ struct wpabuf * wps_build_probe_req_ie(u16 pw_id, struct wps_device_data *dev,
                return NULL;
        }
 
-#ifndef CONFIG_WPS2
-       if (dev->p2p && wps_build_dev_name(dev, ie)) {
-               wpabuf_free(ie);
-               return NULL;
-       }
-#endif /* CONFIG_WPS2 */
-
        return wps_ie_encapsulate(ie);
 }