From patchwork Sat Sep 28 18:18:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Wetzel X-Patchwork-Id: 1168887 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=quarantine dis=none) header.from=wetzel-home.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Rp7GpLle"; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=wetzel-home.de header.i=@wetzel-home.de header.b="jQZQBo6r"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46gcRH6X9Cz9sPS for ; Sun, 29 Sep 2019 04:20:43 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=AblqwXYcNN72aOVZYAH6ZbYsu83Ru/gDM3oy9nffOFU=; b=Rp7GpLlemRnGTj HIWskhMveVAUJkE7QDSviMY5J8iX5dfvIrxCLswqX+DLGOUKmzWlN/tq0gDFBZ2BHAj7gDLJWeLVj Pytn2vpHncFY3Sc3q3pnBZzdhMVNHoIyXR7in4dzEHjnpD2urmmR4ESBse7RDJDoewZN28xHspTUj OC9ZqNMfgqut/TzWgBL4+/FRsDp6emXj4TAMRqVTTA08MjRdYO2iB/DnGqCvPOLR1eIe07CmCZu07 QT9EgdGvtjVcbEAYCg7Oxm1wtPl8KjZJnk5sN0jSXTWBGKQ+Ug0cfb/F8ZjUbc2UVh7GSMcLJqId/ Ms0b7Jk4unKzN4/6nxzg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.2 #3 (Red Hat Linux)) id 1iEHKh-0003Wy-OV; Sat, 28 Sep 2019 18:20:39 +0000 Received: from 16.mo1.mail-out.ovh.net ([178.33.104.224]) by bombadil.infradead.org with esmtps (Exim 4.92.2 #3 (Red Hat Linux)) id 1iEHJL-00010g-V4 for hostap@lists.infradead.org; Sat, 28 Sep 2019 18:19:20 +0000 Received: from player758.ha.ovh.net (unknown [10.109.146.131]) by mo1.mail-out.ovh.net (Postfix) with ESMTP id 68E51190E68 for ; Sat, 28 Sep 2019 20:19:12 +0200 (CEST) Received: from awhome.eu (p4FF9144D.dip0.t-ipconnect.de [79.249.20.77]) (Authenticated sender: postmaster@awhome.eu) by player758.ha.ovh.net (Postfix) with ESMTPSA id DC606A5F3320; Sat, 28 Sep 2019 18:19:08 +0000 (UTC) From: Alexander Wetzel DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wetzel-home.de; s=wetzel-home; t=1569694743; bh=R4xsUrarYORPYTmidN0594NKek81FI8L9/aHnUOgx0Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=jQZQBo6rmy+l2RiM8leRKTAIOTRrOpjP1KdhGF9ABY62LwSiC//JdNMnTWTHMcoHL hVe0BfoV01y777yc0GvB+8FMsacvdv4qmRzzoZTJATKsXiyNSGoUXTQ8F1Vx0r37mA tLon6GfAm3RpZFMpzzeLr7QyycGer/wEZm51nThw= To: j@w1.fi Subject: [PATCH v6a 7/7] Fixes for wpa_supplicant: FILS Extended Key ID support Date: Sat, 28 Sep 2019 20:18:07 +0200 Message-Id: <20190928181807.180530-8-alexander@wetzel-home.de> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190928181807.180530-1-alexander@wetzel-home.de> References: <20190928181807.180530-1-alexander@wetzel-home.de> MIME-Version: 1.0 X-Ovh-Tracer-Id: 11826452625670872316 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedufedrfeekgdduvddvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenuc X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190928_111916_147706_9F56FF39 X-CRM114-Status: GOOD ( 10.84 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [178.33.104.224 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [178.33.104.224 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alexander Wetzel , hostap@lists.infradead.org, luca@coelho.fi, johannes@sipsolutions.net Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org This is a correction on top of: [PATCH v6 14/17] wpa_supplicant: FILS Extended Key ID support Changes: - move handle_extended_key_id() call, so sm->pairwise is set when the function is called. Signed-off-by: Alexander Wetzel --- src/ap/wpa_auth_ft.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/ap/wpa_auth_ft.c b/src/ap/wpa_auth_ft.c index 6afefe983..f242fc508 100644 --- a/src/ap/wpa_auth_ft.c +++ b/src/ap/wpa_auth_ft.c @@ -2775,8 +2775,7 @@ static int wpa_ft_set_key_mgmt(struct wpa_state_machine *sm, return -1; } sm->pairwise = wpa_pick_pairwise_cipher(ciphers, 0); - - return 0; + return handle_extended_key_id(sm, parse->capabilities); } @@ -2888,9 +2887,6 @@ static int wpa_ft_process_auth_req(struct wpa_state_machine *sm, return WLAN_STATUS_UNSPECIFIED_FAILURE; } - if (handle_extended_key_id(sm, parse.capabilities)) - return WLAN_STATUS_UNSPECIFIED_FAILURE; - use_sha384 = wpa_key_mgmt_sha384(parse.key_mgmt); pmk_r1_len = use_sha384 ? SHA384_MAC_LEN : PMK_LEN;