From patchwork Sun Mar 15 19:04:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Wetzel X-Patchwork-Id: 1255141 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) 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.a=rsa-sha256 header.s=bombadil.20170209 header.b=V7qQp3pt; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=wetzel-home.de header.i=@wetzel-home.de header.a=rsa-sha256 header.s=wetzel-home header.b=nJUN4ftV; 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 48gTR64Zn8z9sPJ for ; Mon, 16 Mar 2020 06:05:38 +1100 (AEDT) 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=frUn6SW/hPs47A5Y4LicXgRxepxLbyqXYvNaLGK7Xwc=; b=V7qQp3ptFE7HdL SgRdYjheiFsJpxHQKkMwkBAIRG8AgZPobend7w/EXfShOjDWLQDeEZ5pR/U9BjEcy2IHQ7CDejPi8 PnathWxXsXHR1TFabfB6rFV7WeikLpgRoH0NfOpz71ftigRDAjMO+cFGFdreYfftKEiQRU2QBRiJ9 QuVg96wkhd3EIXbVCtgl982XTvjrXrgTb/zAGlJoW6/zZpG3UTUeFId6AI0cRM/1FkiRlE8PLM84W 2n5p43f0Eo0UmLQPeUXL7l/WyfE0KAArXqYkLcT9Pf/XPdOxzJ0ESMpAWPSQK45CnDeTo5GXOVlYR bxfCxReZDecCkxDmPKPg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jDYZl-0007cD-BR; Sun, 15 Mar 2020 19:05:29 +0000 Received: from 5.mo68.mail-out.ovh.net ([46.105.62.179]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jDYZQ-00060D-6b for hostap@lists.infradead.org; Sun, 15 Mar 2020 19:05:11 +0000 Received: from player770.ha.ovh.net (unknown [10.108.57.50]) by mo68.mail-out.ovh.net (Postfix) with ESMTP id 991BF15E4DB for ; Sun, 15 Mar 2020 20:04:54 +0100 (CET) Received: from awhome.eu (p4FF9153C.dip0.t-ipconnect.de [79.249.21.60]) (Authenticated sender: postmaster@awhome.eu) by player770.ha.ovh.net (Postfix) with ESMTPSA id CDA301085B10F; Sun, 15 Mar 2020 19:04:52 +0000 (UTC) From: Alexander Wetzel DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wetzel-home.de; s=wetzel-home; t=1584299088; bh=x+KgfScMcV3N453O3J5beBbv7NJteCWsKmOqj4EYK0Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=nJUN4ftVGg4if+L6QpRpKTNdcqJWELK/njkmBhrbvdA1Gf29RAqttfC4cBrvmXYCP +11fHPrOOIbT7LfBQo99eZt861DhTPrgfdiY6djTbo7q6MI1yaDpDxDxZtax9nn4QW ecdXmqkwVo7hRUyOTkOwvaXJQfymNq+pRuh4eT08= To: j@w1.fi Subject: [PATCH 7/8] wlantest: Basic Extended Key ID support Date: Sun, 15 Mar 2020 20:04:25 +0100 Message-Id: <20200315190426.163478-8-alexander@wetzel-home.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200315190426.163478-1-alexander@wetzel-home.de> References: <20200315190426.163478-1-alexander@wetzel-home.de> MIME-Version: 1.0 X-Ovh-Tracer-Id: 8959348511687384257 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedugedrudefuddgvdehucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekredtredttdenucfhrhhomheptehlvgigrghnuggvrhcuhggvthiivghluceorghlvgigrghnuggvrhesfigvthiivghlqdhhohhmvgdruggvqeenucfkpheptddrtddrtddrtddpjeelrddvgeelrddvuddriedtnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmohguvgepshhmthhpqdhouhhtpdhhvghlohepphhlrgihvghrjeejtddrhhgrrdhovhhhrdhnvghtpdhinhgvtheptddrtddrtddrtddpmhgrihhlfhhrohhmpegrlhgvgigrnhguvghrseifvghtiigvlhdqhhhomhgvrdguvgdprhgtphhtthhopehhohhsthgrpheslhhishhtshdrihhnfhhrrgguvggrugdrohhrgh X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200315_120508_599697_8E14BF57 X-CRM114-Status: GOOD ( 10.12 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.3 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 [46.105.62.179 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_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 -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 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: hostap@lists.infradead.org, Alexander Wetzel Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Signed-off-by: Alexander Wetzel --- wlantest/bss.c | 6 ++++-- wlantest/rx_data.c | 6 +++--- wlantest/rx_eapol.c | 4 ++++ 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/wlantest/bss.c b/wlantest/bss.c index 0556c72e2..bccd70c0f 100644 --- a/wlantest/bss.c +++ b/wlantest/bss.c @@ -290,7 +290,7 @@ void bss_update(struct wlantest *wt, struct wlantest_bss *bss, "group=%s%s%s%s%s%s%s%s%s" "mgmt_group_cipher=%s%s%s%s%s" "key_mgmt=%s%s%s%s%s%s%s%s%s" - "rsn_capab=%s%s%s%s%s%s", + "rsn_capab=%s%s%s%s%s%s%s", MAC2STR(bss->bssid), bss->proto == 0 ? "OPEN " : "", bss->proto & WPA_PROTO_WPA ? "WPA " : "", @@ -341,7 +341,9 @@ void bss_update(struct wlantest *wt, struct wlantest_bss *bss, bss->rsn_capab & WPA_CAPABILITY_MFPC ? "MFPC " : "", bss->rsn_capab & WPA_CAPABILITY_PEERKEY_ENABLED ? "PEERKEY " : "", - bss->rsn_capab & WPA_CAPABILITY_OCVC ? "OCVC " : ""); + bss->rsn_capab & WPA_CAPABILITY_OCVC ? "OCVC " : "", + bss->rsn_capab & WPA_CAPABILITY_EXT_KEY_ID_FOR_UNICAST ? + "Extended Key ID" : ""); } diff --git a/wlantest/rx_data.c b/wlantest/rx_data.c index f0f0df95c..96331995d 100644 --- a/wlantest/rx_data.c +++ b/wlantest/rx_data.c @@ -447,9 +447,9 @@ static void rx_data_bss_prot(struct wlantest *wt, } keyid = data[3] >> 6; - if (keyid != 0) { - add_note(wt, MSG_INFO, "Unexpected non-zero KeyID %d in " - "individually addressed Data frame from " MACSTR, + if (keyid != 0 && keyid != 1) { + add_note(wt, MSG_INFO, "Unexpected KeyID %d in individually " + "addressed Data frame from " MACSTR, keyid, MAC2STR(hdr->addr2)); } diff --git a/wlantest/rx_eapol.c b/wlantest/rx_eapol.c index 2e49929c1..ce068fc68 100644 --- a/wlantest/rx_eapol.c +++ b/wlantest/rx_eapol.c @@ -464,6 +464,10 @@ static void learn_kde_keys(struct wlantest *wt, struct wlantest_bss *bss, ie.rsn_ie, ie.rsn_ie_len); } + if (ie.key_id) { + add_note(wt, MSG_DEBUG, "KeyID %u", ie.key_id[0]); + } + if (ie.gtk) { wpa_hexdump(MSG_MSGDUMP, "EAPOL-Key Key Data - GTK KDE", ie.gtk, ie.gtk_len);