From patchwork Sat Aug 24 16:05:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Wetzel X-Patchwork-Id: 1152686 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="Dz9h7I9O"; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=wetzel-home.de header.i=@wetzel-home.de header.b="W5dCsUE8"; 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 46G37G48qbz9s3Z for ; Sun, 25 Aug 2019 02:07:06 +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=HlN2L9OK4cEjK0qEghQMbk+8CPQ3I3yQUWKVhcyuQVo=; b=Dz9h7I9OcG7ERw dM0cwKJ03SmtTijwUrk7+Bli/TsUBhMsa3e2IZo7LKifKHFe97LAH6ly4dRbafbRDp8/LP6hXWACm P7nQ0bS8L9o5bOwKeRtr6AvNaxLFas6veHh/6BCAUbw9bpiPzOb/y3oZ0ge0T7h513zzOjV6ha6Po UobTkzF1YhBMlXtpEzB5/e/vKr33l7R6hGCNQx4KCYhNIVMFRtoGtjDDsr4D1d1/WQnA6+HImsO9n 9dNWG9zapZEZzUlpQdFyyDkf5k5EQ13ny3MD85fdWq7ERrrnwdC+sU1q3dlJVqQcGZZvfMpPq6f8E Cr7DjUJxsPMSugRCrcmg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1i1YZC-0006HE-CI; Sat, 24 Aug 2019 16:07:02 +0000 Received: from 8.mo3.mail-out.ovh.net ([87.98.172.249]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1i1YY4-0005Jg-Ch for hostap@lists.infradead.org; Sat, 24 Aug 2019 16:05:56 +0000 Received: from player716.ha.ovh.net (unknown [10.109.160.232]) by mo3.mail-out.ovh.net (Postfix) with ESMTP id DCEDD2236F7 for ; Sat, 24 Aug 2019 18:05:41 +0200 (CEST) Received: from awhome.eu (p57B7E04C.dip0.t-ipconnect.de [87.183.224.76]) (Authenticated sender: postmaster@awhome.eu) by player716.ha.ovh.net (Postfix) with ESMTPSA id 8DC7B90591E2; Sat, 24 Aug 2019 16:05:36 +0000 (UTC) From: Alexander Wetzel DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wetzel-home.de; s=wetzel-home; t=1566662731; bh=K6igskvVXWKoE8wiFsaZ2K8dQMBgAjzeKPMYXL4w5Ho=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=W5dCsUE8MNuzhVVMWrAACq5nDGRwtsXDH/CCjPwlL3W+XADGwZegVDJkOaaIj3HTI f+Q2gDQ0o7IM36uRe9WyI71VKgL264TDrMTEvI15ohzn04yzy2j8vrQsSuHgU8C516 eAqm2OFKF0sTuNa7pEWVcJ3ZYgJtLiwCzjoxqXmQ= To: j@w1.fi Subject: [PATCH v4 13/16] wpa_supplicant: FILS Extended Key ID support Date: Sat, 24 Aug 2019 18:05:02 +0200 Message-Id: <20190824160505.5548-14-alexander@wetzel-home.de> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190824160505.5548-1-alexander@wetzel-home.de> References: <20190824160505.5548-1-alexander@wetzel-home.de> MIME-Version: 1.0 X-Ovh-Tracer-Id: 6941454404841184508 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeduvddrudehtddguddttdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecu X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190824_090552_746796_4B4C1C4E X-CRM114-Status: GOOD ( 10.34 ) 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_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [87.98.172.249 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 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 implements the FILS Extended Key ID support in wpa_supplicant compatible to our implementation for hostapd: When supporting Extended Key ID the KeyID for the pairwise key id must be also in the FILS handshake. Signed-off-by: Alexander Wetzel --- src/rsn_supp/wpa.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/rsn_supp/wpa.c b/src/rsn_supp/wpa.c index de463cba6..269adcb94 100644 --- a/src/rsn_supp/wpa.c +++ b/src/rsn_supp/wpa.c @@ -4381,6 +4381,7 @@ int fils_process_assoc_resp(struct wpa_sm *sm, const u8 *resp, size_t len) struct wpa_gtk_data gd; int maxkeylen; struct wpa_eapol_ie_parse kde; + struct wpa_ie_data rsn; if (!sm || !sm->ptk_set) { wpa_printf(MSG_DEBUG, "FILS: No KEK available"); @@ -4494,8 +4495,6 @@ int fils_process_assoc_resp(struct wpa_sm *sm, const u8 *resp, size_t len) #ifdef CONFIG_IEEE80211R if (wpa_key_mgmt_ft(sm->key_mgmt) && sm->fils_ft_ies) { - struct wpa_ie_data rsn; - /* Check that PMKR1Name derived by the AP matches */ if (!elems.rsn_ie || wpa_parse_wpa_ie_rsn(elems.rsn_ie - 2, elems.rsn_ie_len + 2, @@ -4563,11 +4562,16 @@ int fils_process_assoc_resp(struct wpa_sm *sm, const u8 *resp, size_t len) keylen, (long unsigned int) sm->ptk.tk_len); goto fail; } + + if (handle_extended_key_id(sm, &kde, + elems.rsn_ie - 2, elems.rsn_ie_len + 2)) + goto fail; + rsclen = wpa_cipher_rsc_len(sm->pairwise_cipher); wpa_hexdump_key(MSG_DEBUG, "FILS: Set TK to driver", sm->ptk.tk, keylen); - if (wpa_sm_set_key(sm, alg, sm->bssid, 0, 1, null_rsc, rsclen, - sm->ptk.tk, keylen, KEY_TYPE_PAIRWISE) < 0) { + if (wpa_sm_set_key(sm, alg, sm->bssid, sm->keyidx_active, 1, null_rsc, + rsclen, sm->ptk.tk, keylen, KEY_TYPE_PAIRWISE) < 0) { wpa_msg(sm->ctx->msg_ctx, MSG_WARNING, "FILS: Failed to set PTK to the driver (alg=%d keylen=%d bssid=" MACSTR ")",