station: disable OCV if offloading is supported
James Prestwood
PATCH 1/1 station: disable OCV if offloading is supported
It was seen during testing that several offload-capable cards were not including the OCI in the 4-way handshake. This made any OCV capable AP unconnectable.
To be safe disable OCV on any cards that support offloading.
--- src/station.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-)
src/station.c +19 -1
@@ -1006,6 +1006,12 @@ static int station_build_handshake_rsn(struct handshake_state *hs,struct ie_rsn_info info;uint8_t *ap_ie;bool disable_ocv; +bool offload =wiphy_has_ext_feature (wiphy, +NL80211_EXT_FEATURE_4WAY_HANDSHAKE_STA_PSK ) || +wiphy_has_ext_feature (wiphy, +NL80211_EXT_FEATURE_4WAY_HANDSHAKE_STA_1X ) || +wiphy_has_ext_feature (wiphy, + NL80211_EXT_FEATURE_SAE_OFFLOAD)memset (&info,0 ,sizeof (info));
@@ -1087,7 +1093,19 @@ build_ie: &disable_ocv)) disable_ocv = false; - info.ocvc = !disable_ocv && bss_info.ocvc && info.mfpc; +/* +* Obviously do not enable OCV if explicitly disabled or no AP support. +* +* Not obviously hostapd rejects OCV support if MFPC is not enabled. +* This is not really specified by the spec, but we have to work around +* this limitation. +* +* Another limitation is full mac cards. With limited testing it was +* seen that they do not include the OCI in the 4-way handshake yet +* still advertise the capability. Because of this OCV is disabled if +* any offload features are detected (since IWD prefers to use offload). +*/ + info.ocvc = !disable_ocv && bss_info.ocvc && info.mfpc && !offload;/* * IEEE 802.11-2020 9.4.2.24.4 states extended key IDs can only be used
Signature · 1 line
2.31.1