diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2022-09-07 07:16:34 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2022-09-07 07:16:34 +0000 |
| commit | 716c3a438b98e677901deb462da7188b5b9b7363 (patch) | |
| tree | 5a42cefa17da84fb89838be454afbeae80c0dda0 | |
| parent | 446ff6767bc18290430b8f97bb9307c6695272ab (diff) | |
| parent | 34641389dd0d42f794ac933071678d2ba2979db8 (diff) | |
| download | wpa_supplicant_8-716c3a438b98e677901deb462da7188b5b9b7363.tar.gz | |
Merge "hidl: add support for FT FILS and FT Suite-B" into tm-qpr-dev
| -rw-r--r-- | wpa_supplicant/aidl/sta_network.cpp | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/wpa_supplicant/aidl/sta_network.cpp b/wpa_supplicant/aidl/sta_network.cpp index fe4a7604..cf3f45d7 100644 --- a/wpa_supplicant/aidl/sta_network.cpp +++ b/wpa_supplicant/aidl/sta_network.cpp @@ -2488,6 +2488,26 @@ void StaNetwork::setFastTransitionKeyMgmt(uint32_t &key_mgmt_mask) key_mgmt_mask |= WPA_KEY_MGMT_FT_SAE; } #endif +#ifdef CONFIG_FILS + if ((key_mgmt_mask & WPA_KEY_MGMT_FILS_SHA256) && + (capa.key_mgmt_iftype[WPA_IF_STATION] & + WPA_DRIVER_CAPA_KEY_MGMT_FT_FILS_SHA256)) { + key_mgmt_mask |= WPA_KEY_MGMT_FT_FILS_SHA256; + } + + if ((key_mgmt_mask & WPA_KEY_MGMT_FILS_SHA384) && + (capa.key_mgmt_iftype[WPA_IF_STATION] & + WPA_DRIVER_CAPA_KEY_MGMT_FT_FILS_SHA384)) { + key_mgmt_mask |= WPA_KEY_MGMT_FT_FILS_SHA384; + } +#endif +#ifdef CONFIG_SUITEB192 + if ((key_mgmt_mask & WPA_KEY_MGMT_IEEE8021X_SUITE_B_192) && + (capa.key_mgmt_iftype[WPA_IF_STATION] & + WPA_DRIVER_CAPA_KEY_MGMT_FT_802_1X_SHA384)) { + key_mgmt_mask |= WPA_KEY_MGMT_FT_IEEE8021X_SHA384; + } +#endif #endif } @@ -2512,6 +2532,20 @@ void StaNetwork::resetFastTransitionKeyMgmt(uint32_t &key_mgmt_mask) key_mgmt_mask &= ~WPA_KEY_MGMT_FT_SAE; } #endif +#ifdef CONFIG_FILS + if (key_mgmt_mask & WPA_KEY_MGMT_FILS_SHA256) { + key_mgmt_mask &= ~WPA_KEY_MGMT_FT_FILS_SHA256; + } + + if (key_mgmt_mask & WPA_KEY_MGMT_FILS_SHA384) { + key_mgmt_mask &= ~WPA_KEY_MGMT_FT_FILS_SHA384; + } +#endif +#ifdef CONFIG_SUITEB192 + if (key_mgmt_mask & WPA_KEY_MGMT_IEEE8021X_SUITE_B_192) { + key_mgmt_mask &= ~WPA_KEY_MGMT_FT_IEEE8021X_SHA384; + } +#endif #endif } |