WPS 2.0: Fix Probe Request WPS IE building to be able to fragment data

If all the device information attributes use their maximum lengths,
a single WPS IE is not enough to fit in all the data and as such,
we must be able to fragment the data. In addition, the wpabuf needs
to be allocated larger to fit in maximum data.

diff --git a/src/wps/wps.c b/src/wps/wps.c
index 04bc4331f5b817fe739a5ed85dbf01e2ecd65b8c..48cc2d84e43c522dcceb4e33d6f5f27e354f27a8 100644 (file)
--- a/src/wps/wps.c
+++ b/src/wps/wps.c
@@ -427,19 +427,14 @@ struct wpabuf * wps_build_probe_req_ie(int pbc, struct wps_device_data *dev,
                                       enum wps_request_type req_type)
 {
        struct wpabuf *ie;
-       u8 *len;
        u16 methods;
 
        wpa_printf(MSG_DEBUG, "WPS: Building WPS IE for Probe Request");
 
-       ie = wpabuf_alloc(200);
+       ie = wpabuf_alloc(500);
        if (ie == NULL)
                return NULL;
 
-       wpabuf_put_u8(ie, WLAN_EID_VENDOR_SPECIFIC);
-       len = wpabuf_put(ie, 1);
-       wpabuf_put_be32(ie, WPS_DEV_OUI_WFA);
-
        if (pbc) {
                methods = WPS_CONFIG_PUSHBUTTON;
                /*
@@ -486,9 +481,7 @@ struct wpabuf * wps_build_probe_req_ie(int pbc, struct wps_device_data *dev,
                return NULL;
        }
 
-       *len = wpabuf_len(ie) - 2;
-
-       return ie;
+       return wps_ie_encapsulate(ie);
 }
 
 

diff --git a/src/wps/wps_attr_build.c b/src/wps/wps_attr_build.c
index 8068654fd54185f88f3355f4e781f2e0035b69fe..f10f3c8daec5f85c720dd0e7ea21d2ec32414ba0 100644 (file)
--- a/src/wps/wps_attr_build.c
+++ b/src/wps/wps_attr_build.c
@@ -19,6 +19,7 @@
 #include "crypto/crypto.h"
 #include "crypto/dh_group5.h"
 #include "crypto/sha256.h"
+#include "common/ieee802_11_defs.h"
 #include "wps_i.h"
 
 
@@ -347,3 +348,35 @@ int wps_build_req_to_enroll(struct wpabuf *msg)
        wpabuf_put_u8(msg, 1);
        return 0;
 }
+
+
+/* Encapsulate WPS IE data with one (or more, if needed) IE headers */
+struct wpabuf * wps_ie_encapsulate(struct wpabuf *data)
+{
+       struct wpabuf *ie;
+       const u8 *pos, *end;
+
+       ie = wpabuf_alloc(wpabuf_len(data) + 100);
+       if (ie == NULL) {
+               wpabuf_free(data);
+               return NULL;
+       }
+
+       pos = wpabuf_head(data);
+       end = pos + wpabuf_len(data);
+
+       while (end > pos) {
+               size_t frag_len = end - pos;
+               if (frag_len > 251)
+                       frag_len = 251;
+               wpabuf_put_u8(ie, WLAN_EID_VENDOR_SPECIFIC);
+               wpabuf_put_u8(ie, 4 + frag_len);
+               wpabuf_put_be32(ie, WPS_DEV_OUI_WFA);
+               wpabuf_put_data(ie, pos, frag_len);
+               pos += frag_len;
+       }
+
+       wpabuf_free(data);
+
+       return ie;
+}

diff --git a/src/wps/wps_i.h b/src/wps/wps_i.h
index 2110a54322c673bbbdb5bc37713fa795e0fada97..5a3246e7db8aca14244f189918c501c0f0e33784 100644 (file)
--- a/src/wps/wps_i.h
+++ b/src/wps/wps_i.h
@@ -248,6 +248,7 @@ int wps_build_conn_type_flags(struct wps_data *wps, struct wpabuf *msg);
 int wps_build_assoc_state(struct wps_data *wps, struct wpabuf *msg);
 int wps_build_oob_dev_password(struct wpabuf *msg, struct wps_context *wps);
 int wps_build_req_to_enroll(struct wpabuf *msg);
+struct wpabuf * wps_ie_encapsulate(struct wpabuf *data);
 
 /* wps_attr_process.c */
 int wps_process_authenticator(struct wps_data *wps, const u8 *authenticator,

diff --git a/src/wps/wps_registrar.c b/src/wps/wps_registrar.c
index 05fc7f2e041b9731ad5f13f69de063e794bd43b6..9574fcad803524a0333ed524e3277099e9bdce01 100644 (file)
--- a/src/wps/wps_registrar.c
+++ b/src/wps/wps_registrar.c
@@ -958,38 +958,6 @@ static void wps_cb_set_sel_reg(struct wps_registrar *reg)
 }
 
 
-/* Encapsulate WPS IE data with one (or more, if needed) IE headers */
-static struct wpabuf * wps_ie_encapsulate(struct wpabuf *data)
-{
-       struct wpabuf *ie;
-       const u8 *pos, *end;
-
-       ie = wpabuf_alloc(wpabuf_len(data) + 100);
-       if (ie == NULL) {
-               wpabuf_free(data);
-               return NULL;
-       }
-
-       pos = wpabuf_head(data);
-       end = pos + wpabuf_len(data);
-
-       while (end > pos) {
-               size_t frag_len = end - pos;
-               if (frag_len > 251)
-                       frag_len = 251;
-               wpabuf_put_u8(ie, WLAN_EID_VENDOR_SPECIFIC);
-               wpabuf_put_u8(ie, 4 + frag_len);
-               wpabuf_put_be32(ie, WPS_DEV_OUI_WFA);
-               wpabuf_put_data(ie, pos, frag_len);
-               pos += frag_len;
-       }
-
-       wpabuf_free(data);
-
-       return ie;
-}
-
-
 static int wps_set_ie(struct wps_registrar *reg)
 {
        struct wpabuf *beacon;