Skip to contentSkip to conversation

station: limit extended key IDs to CCMP ciphers

PATCH Applied James Prestwood 2 participants 2 messages Oct 12, 2021 – Oct 13, 2021

lore
Share & tools
lore

James Prestwood

author
#0 lore raw

PATCH 1/1 station: limit extended key IDs to CCMP ciphers

---
 src/station.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
src/station.c +7 -2
index bfd69777..c73db634 100644
@@ -1087,8 +1087,13 @@ build_ie:
 
 	info.ocvc = !disable_ocv && bss_info.ocvc;
 
-	/* Extended Key IDs can only be used if supported by both AP and STA */
-	if (wiphy_supports_ext_key_id(wiphy) && bss_info.extended_key_id)
+	/*
+	 * IEEE 802.11-2020 9.4.2.24.4 states extended key IDs can only be used
+	 * with CCMP/GCMP cipher suites. We also only enable support if the AP
+	 * also indicates support.
+	 */
+	if (wiphy_supports_ext_key_id(wiphy) && bss_info.extended_key_id &&
+			info.pairwise_ciphers == IE_RSN_CIPHER_SUITE_CCMP)
 		info.extended_key_id = true;
 
 	/* RSN takes priority */
Signature · 1 line
2.31.1
Applied
#1 lore raw

Hi James,

Quoted 4 lines · James Prestwood
---
  src/station.c | 9 +++++++--
  1 file changed, 7 insertions(+), 2 deletions(-)

Applied, thanks.

Regards,
-Denis