From: Jouni Malinen <j@w1.fi>
Date: Thu, 24 Nov 2011 20:05:33 +0000 (+0200)
Subject: WPS: Include WSC IE in (Re)Association Response for maybe-WPS case
X-Git-Tag: aosp-jb-start~272
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=71093e5ea994596b1fa6d89cc1cc48626ae7c630;p=thirdparty%2Fhostap.git

WPS: Include WSC IE in (Re)Association Response for maybe-WPS case

If the station is indicating use of WPS, WSC IE should be added into the
(Re)Association Response frame. This is clear for the case when WSC IE
was included in the (Re)Association Request frame. However, even the
WLAN_STA_MAYBE_WPS case may actually indicate use of WPS. Assume that to
be the case when WPA/WPA2 is enabled (i.e., when the STA does not
include WPA/RSN/WSC IE while AP has WPA/RSN enabled).

Signed-hostap: Jouni Malinen <j@w1.fi>
---

diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c
index 36f04d516..a8a9bd4ed 100644
--- a/src/ap/ieee802_11.c
+++ b/src/ap/ieee802_11.c
@@ -868,7 +868,8 @@ static void send_assoc_resp(struct hostapd_data *hapd, struct sta_info *sta,
 		p = hostapd_eid_wmm(hapd, p);
 
 #ifdef CONFIG_WPS
-	if (sta->flags & WLAN_STA_WPS) {
+	if ((sta->flags & WLAN_STA_WPS) ||
+	    ((sta->flags & WLAN_STA_MAYBE_WPS) && hapd->conf->wpa)) {
 		struct wpabuf *wps = wps_build_assoc_resp_ie();
 		if (wps) {
 			os_memcpy(p, wpabuf_head(wps), wpabuf_len(wps));