From patchwork Wed Mar 16 06:01:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daichi Ueura X-Patchwork-Id: 598137 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (unknown [198.137.202.9]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3qQ1D25wZtz9sDb for ; Wed, 16 Mar 2016 17:04:50 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ag4Xs-0000Wm-P3; Wed, 16 Mar 2016 06:03:00 +0000 Received: from seldsegrel01.sonyericsson.com ([37.139.156.29]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ag4Xn-0000Rr-T6 for hostap@lists.infradead.org; Wed, 16 Mar 2016 06:02:57 +0000 From: Daichi Ueura To: Subject: [PATCH] Handle OSEN IE in assoc request if req_ies exists Date: Wed, 16 Mar 2016 15:01:59 +0900 Message-ID: <1458108119-10554-1-git-send-email-daichi.ueura@sonymobile.com> X-Mailer: git-send-email 2.4.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160315_230256_267410_A12B7E8E X-CRM114-Status: UNSURE ( 5.24 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_MSPIKE_H4 RBL: Very Good reputation (+4) [37.139.156.29 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: daisuke.x.niwa@sonymobile.com, Daichi Ueura Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Daisuke Niwa 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 --- wpa_supplicant/events.c | 2 ++ 1 file changed, 2 insertions(+) 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;