WPS 2.0: Make WSC 2.0 support to be build option (CONFIG_WPS2)

For now, the default build will only include WSC 1.0 support.
CONFIG_WPS2=y can be used to add support for WSC 2.0.

wpa_supplicant/Makefile

@@ -455,6 +455,10 @@ NEED_AES_OMAC1=y
 endif
 
 ifdef CONFIG_WPS
+ifdef CONFIG_WPS2
+CFLAGS += -DCONFIG_WPS2
+endif
+
 # EAP-WSC
 CFLAGS += -DCONFIG_WPS -DEAP_WSC
 OBJS += wps_supplicant.o

wpa_supplicant/README-WPS

@@ -62,6 +62,7 @@ configuration that includes WPS support and Linux wireless extensions
 
 CONFIG_DRIVER_WEXT=y
 CONFIG_WPS=y
+CONFIG_WPS2=y
 
 
 WPS needs the Universally Unique IDentifier (UUID; see RFC 4122) for

wpa_supplicant/ctrl_iface.c

@@ -836,8 +836,10 @@ static char * wpa_supplicant_wps_ie_txt_buf(struct wpa_supplicant *wpa_s,
 		return pos;
 	if (wps_is_selected_pbc_registrar(wps_ie))
 		txt = "[WPS-PBC]";
+#ifdef CONFIG_WPS2
 	else if (wps_is_addr_authorized(wps_ie, wpa_s->own_addr, 0))
 		txt = "[WPS-AUTH]";
+#endif /* CONFIG_WPS2 */
 	else if (wps_is_selected_pin_registrar(wps_ie))
 		txt = "[WPS-PIN]";
 	else

wpa_supplicant/defconfig

@@ -194,6 +194,8 @@ CONFIG_EAP_LEAP=y
 
 # Wi-Fi Protected Setup (WPS)
 #CONFIG_WPS=y
+# Enable WSC 2.0 support
+#CONFIG_WPS2=y
 
 # EAP-IKEv2
 #CONFIG_EAP_IKEV2=y

wpa_supplicant/wpa_supplicant.conf

@@ -201,6 +201,9 @@ fast_reauth=1
 # Available methods: usba ethernet label display ext_nfc_token int_nfc_token
 #	nfc_interface push_button keypad virtual_display physical_display
 #	virtual_push_button physical_push_button
+# For WSC 1.0:
+#config_methods=label display push_button keypad
+# For WSC 2.0:
 #config_methods=label virtual_display virtual_push_button keypad
 
 # Credential processing