WPS: Fix strict validation of encrypted data for WSC 2.0-only case

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

diff --git a/src/wps/wps_validate.c b/src/wps/wps_validate.c
index 6969d65..c3071a0 100644 (file)
--- a/src/wps/wps_validate.c
+++ b/src/wps/wps_validate.c
@@ -19,6 +19,11 @@
 #include "wps.h"
 
 
+#ifndef WPS_STRICT_ALL
+#define WPS_STRICT_WPS2
+#endif /* WPS_STRICT_ALL */
+
+
 static int wps_validate_version(const u8 *version, int mandatory)
 {
        if (version == NULL) {
@@ -1117,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;
@@ -1161,15 +1167,21 @@ 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;
 }
 
 
-int wps_validate_probe_req(const struct wpabuf *wps_ie)
+int wps_validate_probe_req(const struct wpabuf *wps_ie, const u8 *addr)
 {
        struct wps_parse_attr attr;
        int wps2;
@@ -1208,7 +1220,7 @@ int wps_validate_probe_req(const struct wpabuf *wps_ie)
            wps_validate_req_dev_type(attr.req_dev_type, attr.num_req_dev_type,
                                      0)) {
                wpa_printf(MSG_INFO, "WPS-STRICT: Invalid Probe Request "
-                          "frame");
+                          "frame from " MACSTR, MAC2STR(addr));
                return -1;
        }
 
@@ -1263,7 +1275,7 @@ int wps_validate_assoc_resp(const struct wpabuf *wps_ie)
 
        wps2 = attr.version2 != NULL;
        if (wps_validate_version(attr.version, 1) ||
-           wps_validate_request_type(attr.request_type, 1) ||
+           wps_validate_response_type(attr.response_type, 1) ||
            wps_validate_version2(attr.version2, wps2)) {
                wpa_printf(MSG_INFO, "WPS-STRICT: Invalid (Re)Association "
                           "Response frame");
@@ -1318,7 +1330,12 @@ int wps_validate_m1(const struct wpabuf *tlvs)
            wps_validate_version2(attr.version2, wps2) ||
            wps_validate_request_to_enroll(attr.request_to_enroll, 0)) {
                wpa_printf(MSG_INFO, "WPS-STRICT: Invalid M1");
+#ifdef WPS_STRICT_WPS2
+               if (wps2)
+                       return -1;
+#else /* WPS_STRICT_WPS2 */
                return -1;
+#endif /* WPS_STRICT_WPS2 */
        }
 
        return 0;
@@ -1368,7 +1385,12 @@ int wps_validate_m2(const struct wpabuf *tlvs)
            wps_validate_version2(attr.version2, wps2) ||
            wps_validate_authenticator(attr.authenticator, 1)) {
                wpa_printf(MSG_INFO, "WPS-STRICT: Invalid M2");
+#ifdef WPS_STRICT_WPS2
+               if (wps2)
+                       return -1;
+#else /* WPS_STRICT_WPS2 */
                return -1;
+#endif /* WPS_STRICT_WPS2 */
        }
 
        return 0;
@@ -1415,7 +1437,12 @@ int wps_validate_m2d(const struct wpabuf *tlvs)
            wps_validate_os_version(attr.os_version, 1) ||
            wps_validate_version2(attr.version2, wps2)) {
                wpa_printf(MSG_INFO, "WPS-STRICT: Invalid M2D");
+#ifdef WPS_STRICT_WPS2
+               if (wps2)
+                       return -1;
+#else /* WPS_STRICT_WPS2 */
                return -1;
+#endif /* WPS_STRICT_WPS2 */
        }
 
        return 0;
@@ -1446,7 +1473,12 @@ int wps_validate_m3(const struct wpabuf *tlvs)
            wps_validate_version2(attr.version2, wps2) ||
            wps_validate_authenticator(attr.authenticator, 1)) {
                wpa_printf(MSG_INFO, "WPS-STRICT: Invalid M3");
+#ifdef WPS_STRICT_WPS2
+               if (wps2)
+                       return -1;
+#else /* WPS_STRICT_WPS2 */
                return -1;
+#endif /* WPS_STRICT_WPS2 */
        }
 
        return 0;
@@ -1479,17 +1511,21 @@ int wps_validate_m4(const struct wpabuf *tlvs)
            wps_validate_version2(attr.version2, wps2) ||
            wps_validate_authenticator(attr.authenticator, 1)) {
                wpa_printf(MSG_INFO, "WPS-STRICT: Invalid M4");
+#ifdef WPS_STRICT_WPS2
+               if (wps2)
+                       return -1;
+#else /* WPS_STRICT_WPS2 */
                return -1;
+#endif /* WPS_STRICT_WPS2 */
        }
 
        return 0;
 }
 
 
-int wps_validate_m4_encr(const struct wpabuf *tlvs)
+int wps_validate_m4_encr(const struct wpabuf *tlvs, int wps2)
 {
        struct wps_parse_attr attr;
-       int wps2;
 
        if (tlvs == NULL) {
                wpa_printf(MSG_INFO, "WPS-STRICT: No TLVs in M4 encrypted "
@@ -1502,12 +1538,16 @@ int wps_validate_m4_encr(const struct wpabuf *tlvs)
                return -1;
        }
 
-       wps2 = attr.version2 != NULL;
        if (wps_validate_r_snonce1(attr.r_snonce1, 1) ||
            wps_validate_key_wrap_auth(attr.key_wrap_auth, 1)) {
                wpa_printf(MSG_INFO, "WPS-STRICT: Invalid M4 encrypted "
                           "settings");
+#ifdef WPS_STRICT_WPS2
+               if (wps2)
+                       return -1;
+#else /* WPS_STRICT_WPS2 */
                return -1;
+#endif /* WPS_STRICT_WPS2 */
        }
 
        return 0;
@@ -1538,17 +1578,21 @@ int wps_validate_m5(const struct wpabuf *tlvs)
            wps_validate_version2(attr.version2, wps2) ||
            wps_validate_authenticator(attr.authenticator, 1)) {
                wpa_printf(MSG_INFO, "WPS-STRICT: Invalid M5");
+#ifdef WPS_STRICT_WPS2
+               if (wps2)
+                       return -1;
+#else /* WPS_STRICT_WPS2 */
                return -1;
+#endif /* WPS_STRICT_WPS2 */
        }
 
        return 0;
 }
 
 
-int wps_validate_m5_encr(const struct wpabuf *tlvs)
+int wps_validate_m5_encr(const struct wpabuf *tlvs, int wps2)
 {
        struct wps_parse_attr attr;
-       int wps2;
 
        if (tlvs == NULL) {
                wpa_printf(MSG_INFO, "WPS-STRICT: No TLVs in M5 encrypted "
@@ -1561,12 +1605,16 @@ int wps_validate_m5_encr(const struct wpabuf *tlvs)
                return -1;
        }
 
-       wps2 = attr.version2 != NULL;
        if (wps_validate_e_snonce1(attr.e_snonce1, 1) ||
            wps_validate_key_wrap_auth(attr.key_wrap_auth, 1)) {
                wpa_printf(MSG_INFO, "WPS-STRICT: Invalid M5 encrypted "
                           "settings");
+#ifdef WPS_STRICT_WPS2
+               if (wps2)
+                       return -1;
+#else /* WPS_STRICT_WPS2 */
                return -1;
+#endif /* WPS_STRICT_WPS2 */
        }
 
        return 0;
@@ -1597,17 +1645,21 @@ int wps_validate_m6(const struct wpabuf *tlvs)
            wps_validate_version2(attr.version2, wps2) ||
            wps_validate_authenticator(attr.authenticator, 1)) {
                wpa_printf(MSG_INFO, "WPS-STRICT: Invalid M6");
+#ifdef WPS_STRICT_WPS2
+               if (wps2)
+                       return -1;
+#else /* WPS_STRICT_WPS2 */
                return -1;
+#endif /* WPS_STRICT_WPS2 */
        }
 
        return 0;
 }
 
 
-int wps_validate_m6_encr(const struct wpabuf *tlvs)
+int wps_validate_m6_encr(const struct wpabuf *tlvs, int wps2)
 {
        struct wps_parse_attr attr;
-       int wps2;
 
        if (tlvs == NULL) {
                wpa_printf(MSG_INFO, "WPS-STRICT: No TLVs in M6 encrypted "
@@ -1620,12 +1672,16 @@ int wps_validate_m6_encr(const struct wpabuf *tlvs)
                return -1;
        }
 
-       wps2 = attr.version2 != NULL;
        if (wps_validate_r_snonce2(attr.r_snonce2, 1) ||
            wps_validate_key_wrap_auth(attr.key_wrap_auth, 1)) {
                wpa_printf(MSG_INFO, "WPS-STRICT: Invalid M6 encrypted "
                           "settings");
+#ifdef WPS_STRICT_WPS2
+               if (wps2)
+                       return -1;
+#else /* WPS_STRICT_WPS2 */
                return -1;
+#endif /* WPS_STRICT_WPS2 */
        }
 
        return 0;
@@ -1657,17 +1713,21 @@ int wps_validate_m7(const struct wpabuf *tlvs)
            wps_validate_version2(attr.version2, wps2) ||
            wps_validate_authenticator(attr.authenticator, 1)) {
                wpa_printf(MSG_INFO, "WPS-STRICT: Invalid M7");
+#ifdef WPS_STRICT_WPS2
+               if (wps2)
+                       return -1;
+#else /* WPS_STRICT_WPS2 */
                return -1;
+#endif /* WPS_STRICT_WPS2 */
        }
 
        return 0;
 }
 
 
-int wps_validate_m7_encr(const struct wpabuf *tlvs, int ap)
+int wps_validate_m7_encr(const struct wpabuf *tlvs, int ap, int wps2)
 {
        struct wps_parse_attr attr;
-       int wps2;
 
        if (tlvs == NULL) {
                wpa_printf(MSG_INFO, "WPS-STRICT: No TLVs in M7 encrypted "
@@ -1680,7 +1740,6 @@ int wps_validate_m7_encr(const struct wpabuf *tlvs, int ap)
                return -1;
        }
 
-       wps2 = attr.version2 != NULL;
        if (wps_validate_e_snonce2(attr.e_snonce2, 1) ||
            wps_validate_ssid(attr.ssid, attr.ssid_len, !ap) ||
            wps_validate_mac_addr(attr.mac_addr, !ap) ||
@@ -1692,7 +1751,12 @@ int wps_validate_m7_encr(const struct wpabuf *tlvs, int ap)
            wps_validate_key_wrap_auth(attr.key_wrap_auth, 1)) {
                wpa_printf(MSG_INFO, "WPS-STRICT: Invalid M7 encrypted "
                           "settings");
+#ifdef WPS_STRICT_WPS2
+               if (wps2)
+                       return -1;
+#else /* WPS_STRICT_WPS2 */
                return -1;
+#endif /* WPS_STRICT_WPS2 */
        }
 
        return 0;
@@ -1723,17 +1787,21 @@ int wps_validate_m8(const struct wpabuf *tlvs)
            wps_validate_version2(attr.version2, wps2) ||
            wps_validate_authenticator(attr.authenticator, 1)) {
                wpa_printf(MSG_INFO, "WPS-STRICT: Invalid M8");
+#ifdef WPS_STRICT_WPS2
+               if (wps2)
+                       return -1;
+#else /* WPS_STRICT_WPS2 */
                return -1;
+#endif /* WPS_STRICT_WPS2 */
        }
 
        return 0;
 }
 
 
-int wps_validate_m8_encr(const struct wpabuf *tlvs, int ap)
+int wps_validate_m8_encr(const struct wpabuf *tlvs, int ap, int wps2)
 {
        struct wps_parse_attr attr;
-       int wps2;
 
        if (tlvs == NULL) {
                wpa_printf(MSG_INFO, "WPS-STRICT: No TLVs in M8 encrypted "
@@ -1746,7 +1814,6 @@ int wps_validate_m8_encr(const struct wpabuf *tlvs, int ap)
                return -1;
        }
 
-       wps2 = attr.version2 != NULL;
        if (wps_validate_ssid(attr.ssid, attr.ssid_len, ap) ||
            wps_validate_auth_type(attr.auth_type, ap) ||
            wps_validate_encr_type(attr.encr_type, ap) ||
@@ -1757,7 +1824,12 @@ int wps_validate_m8_encr(const struct wpabuf *tlvs, int ap)
            wps_validate_key_wrap_auth(attr.key_wrap_auth, 1)) {
                wpa_printf(MSG_INFO, "WPS-STRICT: Invalid M8 encrypted "
                           "settings");
+#ifdef WPS_STRICT_WPS2
+               if (wps2)
+                       return -1;
+#else /* WPS_STRICT_WPS2 */
                return -1;
+#endif /* WPS_STRICT_WPS2 */
        }
 
        return 0;
@@ -1786,7 +1858,12 @@ int wps_validate_wsc_ack(const struct wpabuf *tlvs)
            wps_validate_registrar_nonce(attr.registrar_nonce, 1) ||
            wps_validate_version2(attr.version2, wps2)) {
                wpa_printf(MSG_INFO, "WPS-STRICT: Invalid WSC_ACK");
+#ifdef WPS_STRICT_WPS2
+               if (wps2)
+                       return -1;
+#else /* WPS_STRICT_WPS2 */
                return -1;
+#endif /* WPS_STRICT_WPS2 */
        }
 
        return 0;
@@ -1816,7 +1893,12 @@ int wps_validate_wsc_nack(const struct wpabuf *tlvs)
            wps_validate_config_error(attr.config_error, 1) ||
            wps_validate_version2(attr.version2, wps2)) {
                wpa_printf(MSG_INFO, "WPS-STRICT: Invalid WSC_NACK");
+#ifdef WPS_STRICT_WPS2
+               if (wps2)
+                       return -1;
+#else /* WPS_STRICT_WPS2 */
                return -1;
+#endif /* WPS_STRICT_WPS2 */
        }
 
        return 0;
@@ -1845,7 +1927,12 @@ int wps_validate_wsc_done(const struct wpabuf *tlvs)
            wps_validate_registrar_nonce(attr.registrar_nonce, 1) ||
            wps_validate_version2(attr.version2, wps2)) {
                wpa_printf(MSG_INFO, "WPS-STRICT: Invalid WSC_Done");
+#ifdef WPS_STRICT_WPS2
+               if (wps2)
+                       return -1;
+#else /* WPS_STRICT_WPS2 */
                return -1;
+#endif /* WPS_STRICT_WPS2 */
        }
 
        return 0;
@@ -1882,7 +1969,12 @@ int wps_validate_upnp_set_selected_registrar(const struct wpabuf *tlvs)
            wps_validate_uuid_r(attr.uuid_r, wps2)) {
                wpa_printf(MSG_INFO, "WPS-STRICT: Invalid "
                           "SetSelectedRegistrar");
+#ifdef WPS_STRICT_WPS2
+               if (wps2)
+                       return -1;
+#else /* WPS_STRICT_WPS2 */
                return -1;
+#endif /* WPS_STRICT_WPS2 */
        }
 
        return 0;