Merge branch 'bugfix/wps_workaround_for_Telstra_AP' into 'master'

wps: Relax the check on older config methods in case of WPS2.0 See merge request espressif/esp-idf!5781
nagy592 · Aug 23, 2019 · 8db44f6 · 8db44f6
2 parents 99a58e5 + 19a1af8
commit 8db44f6
Showing 1 changed file with 0 additions and 12 deletions.
diff --git a/components/wpa_supplicant/src/wps/wps_validate.c b/components/wpa_supplicant/src/wps/wps_validate.c
@@ -96,23 +96,11 @@ static int wps_validate_response_type(const u8 *response_type, int mandatory)
 static int valid_config_methods(u16 val, int wps2)
 {
 	if (wps2) {
-		if ((val & 0x6000) && !(val & WPS_CONFIG_DISPLAY)) {
-			wpa_printf(MSG_INFO, "WPS-STRICT: Physical/Virtual "
-				   "Display flag without old Display flag "
-				   "set");
-			return 0;
-		}
 		if (!(val & 0x6000) && (val & WPS_CONFIG_DISPLAY)) {
 			wpa_printf(MSG_INFO, "WPS-STRICT: Display flag "
 				   "without Physical/Virtual Display flag");
 			return 0;
 		}
-		if ((val & 0x0600) && !(val & WPS_CONFIG_PUSHBUTTON)) {
-			wpa_printf(MSG_INFO, "WPS-STRICT: Physical/Virtual "
-				   "PushButton flag without old PushButton "
-				   "flag set");
-			return 0;
-		}
 		if (!(val & 0x0600) && (val & WPS_CONFIG_PUSHBUTTON)) {
 			wpa_printf(MSG_INFO, "WPS-STRICT: PushButton flag "
 				   "without Physical/Virtual PushButton flag");