From: Jouni Malinen <jouni.malinen@atheros.com>
Date: Thu, 22 Jul 2010 20:29:52 +0000 (-0700)
Subject: WPS 2.0: Fix strict mode validation of UPnP MAC Address format
X-Git-Tag: hostap-1-bp~1168
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac4dcaf7bf2ab86823314b1b161e13d802d0ea58;p=thirdparty%2Fhostap.git

WPS 2.0: Fix strict mode validation of UPnP MAC Address format

This was supposed to only reject the message from WPS 2.0 ER, not from
WPS 1.0 ER.
---

diff --git a/src/wps/wps_upnp_web.c b/src/wps/wps_upnp_web.c
index 1a52798ff..250ad8efc 100644
--- a/src/wps/wps_upnp_web.c
+++ b/src/wps/wps_upnp_web.c
@@ -532,7 +532,7 @@ web_process_put_wlan_response(struct upnp_wps_device_sm *sm, char *data,
 				return UPNP_ARG_VALUE_INVALID;
 			}
 		}
-#else /* CONFIG_WPS_STRICT */
+#endif /* CONFIG_WPS_STRICT */
 		if (hwaddr_aton2(val, macaddr) > 0) {
 			/*
 			 * At least some versions of Intel PROset seem to be
@@ -540,13 +540,13 @@ web_process_put_wlan_response(struct upnp_wps_device_sm *sm, char *data,
 			 */
 			wpa_printf(MSG_DEBUG, "WPS UPnP: Workaround - allow "
 				   "incorrect MAC address format in "
-				   "NewWLANEventMAC");
+				   "NewWLANEventMAC: %s -> " MACSTR,
+				   val, MAC2STR(macaddr));
 		} else {
 			wpabuf_free(msg);
 			os_free(val);
 			return UPNP_ARG_VALUE_INVALID;
 		}
-#endif /* CONFIG_WPS_STRICT */
 	}
 	os_free(val);
 	if (ev_type == UPNP_WPS_WLANEVENT_TYPE_EAP) {