wiphy: allow FT AKM to be used if Auth/Assoc is not supported
PATCH v5 1/2 wiphy: allow FT AKM to be used if Auth/Assoc is not supported
Until now FT was only supported via Auth/Assoc commands which barred any fullmac cards from using FT AKMs. With PSK offload support these cards can do FT but only when offloading is used.
--- src/wiphy.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
v5 (forgot to tag v4 on previous set):
* Offloading is assumed if the driver supports it
src/wiphy.c +11 -3
@@ -246,10 +246,18 @@ enum ie_rsn_akm_suite wiphy_select_akm(struct wiphy *wiphy, } wpa2_personal: +/* +* Allow FT if either Auth/Assoc is supported OR if the card +* supports PSK offload. Without Auth/Assoc, PSK offload is the +* only mechanism to allow FT on these cards. +*/ if ((info.akm_suites &IE_RSN_AKM_SUITE_FT_USING_PSK ) && - bss->rsne && bss->mde_present && - wiphy->support_cmds_auth_assoc) -return IE_RSN_AKM_SUITE_FT_USING_PSK ; + bss->rsne && bss->mde_present) { +if (wiphy->support_cmds_auth_assoc || +wiphy_has_ext_feature (wiphy, +NL80211_EXT_FEATURE_4WAY_HANDSHAKE_STA_PSK )) +return IE_RSN_AKM_SUITE_FT_USING_PSK ; + }if (info.akm_suites &IE_RSN_AKM_SUITE_PSK_SHA256 )return IE_RSN_AKM_SUITE_PSK_SHA256 ;
Signature · 1 line
2.26.2
PATCH v5 2/2 netdev: allow PSK offload for FT AKMs
This adds a new connection type, TYPE_PSK_OFFLOAD, which allows the 4-way handshake to be offloaded by the firmware. Offloading will be used if the driver advertises support.
The CMD_ROAM event path was also modified to take into account handshake offloading. If the handshake is offloaded we still must issue GET_SCAN, but not start eapol since the firmware takes care of this.
--- src/netdev.c | 52 +++++++++++++++++++++++++++++++++------------------- 1 file changed, 33 insertions(+), 19 deletions(-)
v5:
* remove 4WayOffload option, offloading will be used by default if the driver supports it
src/netdev.c +33 -19
@@ -71,6 +71,7 @@ enum connection_type {CONNECTION_TYPE_SOFTMAC ,CONNECTION_TYPE_FULLMAC ,CONNECTION_TYPE_SAE_OFFLOAD , + CONNECTION_TYPE_PSK_OFFLOAD, };static uint32_t unicast_watch;
@@ -202,6 +203,7 @@ static inline bool is_offload(struct handshake_state *hs)case CONNECTION_TYPE_FULLMAC :return false;case CONNECTION_TYPE_SAE_OFFLOAD : +case CONNECTION_TYPE_PSK_OFFLOAD :return true; }
@@ -1238,11 +1240,6 @@ static void netdev_connect_ok(struct netdev *netdev) netdev->fw_roam_bss =NULL ; } -/* Allow station to sync the PSK to disk */ -if (is_offload (netdev->handshake)) -handshake_event (netdev->handshake, -HANDSHAKE_EVENT_SETTING_KEYS ); -if (netdev->connect_cb) { netdev->connect_cb (netdev,NETDEV_RESULT_OK ,NULL , netdev->user_data);
@@ -2012,14 +2009,6 @@ process_resp_ies:netdev_send_qos_map_set (netdev, qos_set, qos_len); } -/* -* TODO: Only SAE/WPA3-personal offload is supported. In this case IWD -* is 'done'. In the case of 8021x offload EAP still needs to take -* place, so this must be updated accordingly when that is implemented. -*/ -if (is_offload (netdev->handshake)) - goto done; -if (netdev->sm) {/* * Start processing EAPoL frames now that the state machine
@@ -2031,7 +2020,11 @@ process_resp_ies:return ; } -done: +/* Allow station to sync the PSK to disk */ +if (is_offload (netdev->handshake)) +handshake_event (netdev->handshake, +HANDSHAKE_EVENT_SETTING_KEYS ); +netdev_connect_ok (netdev);return ;
@@ -2663,6 +2656,9 @@ static struct l_genl_msg *netdev_build_cmd_connect(struct netdev *netdev,l_genl_msg_append_attr (msg,NL80211_ATTR_SAE_PASSWORD ,strlen (hs->passphrase), hs->passphrase);break ; +case CONNECTION_TYPE_PSK_OFFLOAD : +l_genl_msg_append_attr (msg,NL80211_ATTR_PMK ,32 , hs->pmk); +break ; }if (prev_bssid)
@@ -3036,15 +3032,19 @@ static int netdev_handshake_state_setup_connection_type(return -ENOTSUP ;switch (hs->akm_suite) { +case IE_RSN_AKM_SUITE_PSK : +case IE_RSN_AKM_SUITE_FT_USING_PSK : +case IE_RSN_AKM_SUITE_PSK_SHA256 : +if (wiphy_has_ext_feature (wiphy, +NL80211_EXT_FEATURE_4WAY_HANDSHAKE_STA_PSK )) + goto psk_offload; +/* fall through */ case IE_RSN_AKM_SUITE_8021X :case IE_RSN_AKM_SUITE_FT_OVER_8021X :case IE_RSN_AKM_SUITE_8021X_SHA256 :case IE_RSN_AKM_SUITE_8021X_SUITE_B_SHA256 :case IE_RSN_AKM_SUITE_8021X_SUITE_B_SHA384 :case IE_RSN_AKM_SUITE_FT_OVER_8021X_SHA384 : -case IE_RSN_AKM_SUITE_PSK : -case IE_RSN_AKM_SUITE_FT_USING_PSK : -case IE_RSN_AKM_SUITE_PSK_SHA256 :if (softmac) goto softmac;
@@ -3086,6 +3086,9 @@ fullmac: sae_offload: nhs->type =CONNECTION_TYPE_SAE_OFFLOAD ;return 0 ; +psk_offload: + nhs->type =CONNECTION_TYPE_PSK_OFFLOAD ; +return 0 ; } static int netdev_connect_common(struct netdev *netdev,
@@ -4104,7 +4107,7 @@ static bool netdev_get_fw_scan_cb(int err, struct l_queue *bss_list,* In this case we should just ignore this and allow the disconnect * logic to continue. */ -if (!netdev->sm) +if (!is_offload (netdev->handshake) && !netdev->sm)return false;if (err <0 ) {
@@ -4132,6 +4135,11 @@ static bool netdev_get_fw_scan_cb(int err, struct l_queue *bss_list,handshake_state_set_authenticator_ie (netdev->handshake, bss->rsne); +if (is_offload (netdev->handshake)) { +netdev_connect_ok (netdev); +return false; + } +eapol_start (netdev->sm);return false;
@@ -4182,14 +4190,20 @@ static void netdev_roam_event(struct l_genl_msg *msg, struct netdev *netdev) goto failed; } +/* Handshake completed in firmware, just get the roamed BSS */ +if (is_offload (netdev->handshake)) + goto get_fw_scan; +/* Reset handshake state */ nhs->complete = false; nhs->ptk_installed = false; nhs->gtk_installed = true; nhs->igtk_installed = true; -handshake_state_set_authenticator_address (netdev->handshake, mac); netdev->handshake->ptk_complete = false; +get_fw_scan: +handshake_state_set_authenticator_address (netdev->handshake, mac); +if (!scan_get_firmware_scan (netdev->wdev_id, netdev_get_fw_scan_cb, netdev,NULL )) goto failed;
Signature · 1 line
2.26.2
Hi James,
Quoted 21 lines · James Prestwood
Until now FT was only supported via Auth/Assoc commands which barred any fullmac cards from using FT AKMs. With PSK offload support these cards can do FT but only when offloading is used.
--- src/wiphy.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)v5 (forgot to tag v4 on previous set):
* Offloading is assumed if the driver supports itsrc/wiphy.c +3
-0@@ -246,10 +246,18 @@ enum ie_rsn_akm_suite wiphy_select_akm(struct wiphy *wiphy, } wpa2_personal: +/* +* Allow FT if either Auth/Assoc is supported OR if the card +* supports PSK offload. Without Auth/Assoc, PSK offload is the
src/wiphy.c enum ie_rsn_akm_suite wiphy_select_akm(struct wiphy *wiphy, · line 258
Quoted 10 lines
src/wiphy.c +6
-3+* only mechanism to allow FT on these cards. +*/ if ((info.akm_suites &IE_RSN_AKM_SUITE_FT_USING_PSK ) && - bss->rsne && bss->mde_present && - wiphy->support_cmds_auth_assoc) -return IE_RSN_AKM_SUITE_FT_USING_PSK ; + bss->rsne && bss->mde_present) { +if (wiphy->support_cmds_auth_assoc || +wiphy_has_ext_feature (wiphy, +NL80211_EXT_FEATURE_4WAY_HANDSHAKE_STA_PSK ))
This if statement is a bit messy now and doesn't follow item M4 in doc/coding-style.txt
Also, I would think wiphy_supports_firmware_roam() is a better indicator as to whether FT should be used or not? Offloading the handshake should have no bearing on whether FT is supported or not...
src/wiphy.c enum ie_rsn_akm_suite wiphy_select_akm(struct wiphy *wiphy, · line 263
Quoted 6 lines
src/wiphy.c +2
-0+return IE_RSN_AKM_SUITE_FT_USING_PSK ; + }if (info.akm_suites &IE_RSN_AKM_SUITE_PSK_SHA256 )return IE_RSN_AKM_SUITE_PSK_SHA256 ;
Regards,
-Denis