From: Jouni Malinen <jouni.malinen@atheros.com>
Date: Wed, 26 May 2010 15:17:13 +0000 (+0300)
Subject: Reassemble WPS IE(s) in (Re)Association Request if needed
X-Git-Tag: hostap-1-bp~1292
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=16e46ec043c25bb117c340003b27fb2294ca607b;p=thirdparty%2Fhostap.git

Reassemble WPS IE(s) in (Re)Association Request if needed

Use a function that will take care of possible (though, very unlikely)
fragmentation of WPS TLVs in (Re)Association Request frames.
---

diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c
index 02baddd4c..22656237d 100644
--- a/src/ap/ieee802_11.c
+++ b/src/ap/ieee802_11.c
@@ -686,8 +686,8 @@ static u16 check_assoc_ies(struct hostapd_data *hapd, struct sta_info *sta,
 			   "Request - assume WPS is used");
 		sta->flags |= WLAN_STA_WPS;
 		wpabuf_free(sta->wps_ie);
-		sta->wps_ie = wpabuf_alloc_copy(elems.wps_ie + 4,
-						elems.wps_ie_len - 4);
+		sta->wps_ie = ieee802_11_vendor_ie_concat(ies, ies_len,
+							  WPS_IE_VENDOR_TYPE);
 		wpa_ie = NULL;
 		wpa_ie_len = 0;
 	} else if (hapd->conf->wps_state && wpa_ie == NULL) {