WPS: Add BSSID to strict validation error messages

[libeap.git] / src / wps / wps_validate.c

diff --git a/src/wps/wps_validate.c b/src/wps/wps_validate.c
index 755f1d4..7888c1b 100644 (file)
--- a/src/wps/wps_validate.c
+++ b/src/wps/wps_validate.c
@@ -1122,7 +1122,8 @@ int wps_validate_beacon(const struct wpabuf *wps_ie)
 }
 
 
-int wps_validate_beacon_probe_resp(const struct wpabuf *wps_ie, int probe)
+int wps_validate_beacon_probe_resp(const struct wpabuf *wps_ie, int probe,
+                                  const u8 *addr)
 {
        struct wps_parse_attr attr;
        int wps2, sel_reg;
@@ -1166,8 +1167,14 @@ int wps_validate_beacon_probe_resp(const struct wpabuf *wps_ie, int probe)
            wps_validate_authorized_macs(attr.authorized_macs,
                                         attr.authorized_macs_len, 0)) {
                wpa_printf(MSG_INFO, "WPS-STRICT: Invalid %sProbe Response "
-                          "frame", probe ? "" : "Beacon/");
+                          "frame from " MACSTR, probe ? "" : "Beacon/",
+                          MAC2STR(addr));
+#ifdef WPS_STRICT_WPS2
+               if (wps2)
+                       return -1;
+#else /* WPS_STRICT_WPS2 */
                return -1;
+#endif /* WPS_STRICT_WPS2 */
        }
 
        return 0;