diff mbox series

[7/8] wlantest: Basic Extended Key ID support

Message ID 20200315190426.163478-8-alexander@wetzel-home.de
State Accepted
Headers show
Series Extended Key ID support | expand

Commit Message

Alexander Wetzel March 15, 2020, 7:04 p.m. UTC
Signed-off-by: Alexander Wetzel <alexander@wetzel-home.de>
---
 wlantest/bss.c      | 6 ++++--
 wlantest/rx_data.c  | 6 +++---
 wlantest/rx_eapol.c | 4 ++++
 3 files changed, 11 insertions(+), 5 deletions(-)
diff mbox series

Patch

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);