station: limit extended key IDs to CCMP ciphers

This commit is contained in:
James Prestwood 2021-10-12 08:34:17 -07:00 committed by Denis Kenzior
parent a205afe2de
commit 219e18323f
1 changed files with 7 additions and 2 deletions

View File

@ -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 */