diff mbox

Handle OSEN IE in assoc request if req_ies exists

Message ID 1458108119-10554-1-git-send-email-daichi.ueura@sonymobile.com
State Accepted
Headers show

Commit Message

Daichi Ueura March 16, 2016, 6:01 a.m. UTC 
From: Daisuke Niwa <daisuke.x.niwa@sonymobile.com>

4-way handshake fails with the following error
 "WPA: No wpa_ie set - cannot generate msg 2/4"
while connecting to OSEN network because OSEN IE
is not handled in wpa_supplicant_event_associnfo
if data->assoc_info.req_ies is not NULL.

Signed-off-by: Daichi Ueura <daichi.ueura@sonymobile.com>
---
 wpa_supplicant/events.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Jouni Malinen March 20, 2016, 6:36 p.m. UTC | #1 
On Wed, Mar 16, 2016 at 03:01:59PM +0900, Daichi Ueura wrote:
> 4-way handshake fails with the following error
>  "WPA: No wpa_ie set - cannot generate msg 2/4"
> while connecting to OSEN network because OSEN IE
> is not handled in wpa_supplicant_event_associnfo
> if data->assoc_info.req_ies is not NULL.

Thanks, applied.
diff mbox

Patch

diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c
index ac3c118..d770107 100644
--- a/wpa_supplicant/events.c
+++ b/wpa_supplicant/events.c
@@ -1984,6 +1984,8 @@  static int wpa_supplicant_event_associnfo(struct wpa_supplicant *wpa_s,
 		}
 		if ((p[0] == WLAN_EID_VENDOR_SPECIFIC && p[1] >= 6 &&
 		     (os_memcmp(&p[2], "\x00\x50\xF2\x01\x01\x00", 6) == 0)) ||
+		    (p[0] == WLAN_EID_VENDOR_SPECIFIC && p[1] >= 4 &&
+		     (os_memcmp(&p[2], "\x50\x6F\x9A\x12", 4) == 0)) ||
 		    (p[0] == WLAN_EID_RSN && p[1] >= 2)) {
 			if (wpa_sm_set_assoc_wpa_ie(wpa_s->wpa, p, len))
 				break;