Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-11-25 01:19:23 +01:00
Code Releases Activity

wiphy: Support GCMP cipher suite

Browse Source
This commit is contained in:
Denis Kenzior 2022-10-20 14:01:39 -05:00
parent 4c30bd68ea
commit 81b9eb515e
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/station.c
View File

@ -1167,7 +1167,8 @@ build_ie:
* also indicates support. * also indicates support.
*/ */
if (wiphy_supports_ext_key_id(wiphy) && bss_info.extended_key_id && if (wiphy_supports_ext_key_id(wiphy) && bss_info.extended_key_id &&
info.pairwise_ciphers == IE_RSN_CIPHER_SUITE_CCMP) (info.pairwise_ciphers & (IE_RSN_CIPHER_SUITE_CCMP |
IE_RSN_CIPHER_SUITE_GCMP)))
info.extended_key_id = true; info.extended_key_id = true;
/* RSN takes priority */ /* RSN takes priority */

7
src/wiphy.c
View File

@ -150,7 +150,9 @@ enum ie_rsn_cipher_suite wiphy_select_cipher(struct wiphy *wiphy, uint16_t mask)
mask &= wiphy->supported_ciphers; mask &= wiphy->supported_ciphers;
/* CCMP is our first choice, TKIP second */ if (mask & IE_RSN_CIPHER_SUITE_GCMP)
return IE_RSN_CIPHER_SUITE_GCMP;
if (mask & IE_RSN_CIPHER_SUITE_CCMP) if (mask & IE_RSN_CIPHER_SUITE_CCMP)
return IE_RSN_CIPHER_SUITE_CCMP; return IE_RSN_CIPHER_SUITE_CCMP;
@ -1234,6 +1236,9 @@ static void parse_supported_ciphers(struct wiphy *wiphy, const void *data,
wiphy->supported_ciphers |= wiphy->supported_ciphers |=
IE_RSN_CIPHER_SUITE_BIP_CMAC; IE_RSN_CIPHER_SUITE_BIP_CMAC;
break; break;
case CRYPTO_CIPHER_GCMP:
wiphy->supported_ciphers |= IE_RSN_CIPHER_SUITE_GCMP;
break;
default: /* TODO: Support other ciphers */ default: /* TODO: Support other ciphers */
break; break;
} }