From: stsp <stsp@openbsd.org>
Date: Mon, 11 Dec 2017 22:23:00 +0000 (+0000)
Subject: Omit the PMKID count field from RSN information elements (IE) if the PMKID
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=f5370d46a3fdf2e4d048a55d44c49470dcacf519;p=openbsd

Omit the PMKID count field from RSN information elements (IE) if the PMKID
list has zero elements and PMKID would be the last field in the RSN IE.

This is correct as per 802.11-2012 8.4.2.27.1 and aligns net80211 code with
behaviour of bwfm(4) firmware, unblocking further progress in that driver.

ok patrick@ phessler@
---

diff --git a/sys/net80211/ieee80211_output.c b/sys/net80211/ieee80211_output.c
index 382e1721837..3dbb6826e76 100644
--- a/sys/net80211/ieee80211_output.c
+++ b/sys/net80211/ieee80211_output.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ieee80211_output.c,v 1.119 2017/10/21 20:15:17 patrick Exp $	*/
+/*	$OpenBSD: ieee80211_output.c,v 1.120 2017/12/11 22:23:00 stsp Exp $	*/
 /*	$NetBSD: ieee80211_output.c,v 1.13 2004/05/31 11:02:55 dyoung Exp $	*/
 
 /*-
@@ -976,14 +976,16 @@ ieee80211_add_rsn_body(u_int8_t *frm, struct ieee80211com *ic,
 		/* write PMKID List (only 1) */
 		memcpy(frm, ni->ni_pmkid, IEEE80211_PMKID_LEN);
 		frm += IEEE80211_PMKID_LEN;
-	} else {
-		/* no PMKID (PMKID Count=0) */
-		LE_WRITE_2(frm, 0); frm += 2;
 	}
 
 	if (!(ic->ic_caps & IEEE80211_C_MFP))
 		return frm;
 
+	if ((ni->ni_flags & IEEE80211_NODE_PMKID) == 0) {
+		/* no PMKID (PMKID Count=0) */
+		LE_WRITE_2(frm, 0); frm += 2;
+	}
+
 	/* write Group Integrity Cipher Suite field */
 	memcpy(frm, oui, 3); frm += 3;
 	switch (ic->ic_rsngroupmgmtcipher) {