wiphy: add getter for 'supports_cmds_auth_assoc'
PATCH 1/6 wiphy: add getter for 'supports_cmds_auth_assoc'
--- src/wiphy.c | 5 +++++ src/wiphy.h | 1 + 2 files changed, 6 insertions(+)
src/wiphy.c +5 -0
@@ -404,6 +404,11 @@ bool wiphy_can_connect(struct wiphy *wiphy, struct scan_bss *bss)return true; } +bool wiphy_supports_cmds_auth_assoc (struct wiphy *wiphy) +{ +return wiphy->support_cmds_auth_assoc; +} +bool wiphy_has_feature (struct wiphy *wiphy,uint32_t feature) {return wiphy->feature_flags & feature;
src/wiphy.h +1 -0
@@ -79,6 +79,7 @@ uint32_t wiphy_get_supported_bands(struct wiphy *wiphy);const struct scan_freq_set *wiphy_get_supported_freqs (const struct wiphy *wiphy);bool wiphy_can_connect (struct wiphy *wiphy,struct scan_bss *bss); +bool wiphy_supports_cmds_auth_assoc (struct wiphy *wiphy);bool wiphy_can_randomize_mac_addr (struct wiphy *wiphy);bool wiphy_rrm_capable (struct wiphy *wiphy);bool wiphy_has_feature (struct wiphy *wiphy,uint32_t feature);
Signature · 1 line
2.26.2
PATCH 2/6 wiphy: check SAE offload in wiphy_select_akm
This allows an SAE AKM to be selected if the hardware does not support SAE in userspace, but does support SAE offload.
--- src/wiphy.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-)
src/wiphy.c +8 -10
@@ -189,17 +189,15 @@ enum ie_rsn_akm_suite wiphy_select_akm(struct wiphy *wiphy, }/* -* TODO: Only SoftMAC (mac80211) drivers are currently -* capable of SAE since it requires ability to send -* Authenticate and Associate frames (which is given by -* support_cmds_auth_assoc). FullMAC drivers require -* SAE offload which we do not support nor supported -* in any upstream driver as of this time. +* If the hardware does not support SAE in userspace +* (NL80211_FEATURE_SAE), has no Auth/Assoc support, +* nor has SAE offload support downgrade to WPA2. */ -if (!wiphy_has_feature (wiphy,NL80211_FEATURE_SAE ) || - !wiphy->support_cmds_auth_assoc) { -l_debug ("No HW WPA3 support, trying WPA2" ); - goto wpa2_personal; +if (!wiphy_has_feature (wiphy,NL80211_FEATURE_SAE )) { +if (!wiphy_has_ext_feature (wiphy, +NL80211_EXT_FEATURE_SAE_OFFLOAD ) && + !wiphy->support_cmds_auth_assoc) + goto wpa2_personal; } if (info.akm_suites &
Signature · 1 line
2.26.2
Re: [PATCH 2/6] wiphy: check SAE offload in wiphy_select_akm
Hi James,
Quoted 13 lines · James Prestwood
This allows an SAE AKM to be selected if the hardware does not support SAE in userspace, but does support SAE offload.
--- src/wiphy.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-)src/wiphy.c +0
-0@@ -189,17 +189,15 @@ enum ie_rsn_akm_suite wiphy_select_akm(struct wiphy *wiphy, }
src/wiphy.c enum ie_rsn_akm_suite wiphy_select_akm(struct wiphy *wiphy, · line 194
Quoted 10 lines
src/wiphy.c +3
-6/* -* TODO: Only SoftMAC (mac80211) drivers are currently -* capable of SAE since it requires ability to send -* Authenticate and Associate frames (which is given by -* support_cmds_auth_assoc). FullMAC drivers require -* SAE offload which we do not support nor supported -* in any upstream driver as of this time. +* If the hardware does not support SAE in userspace +* (NL80211_FEATURE_SAE), has no Auth/Assoc support, +* nor has SAE offload support downgrade to WPA2.
So linux/nl80211.h states:
"
* @NL80211_FEATURE_SAE: This driver supports simultaneous authentication of
* equals (SAE) with user space SME (NL80211_CMD_AUTHENTICATE) in station
* mode
"
However, there's at least one upstream driver (qtnfmac) that supports SAE through CMD_EXTERNAL_AUTH and sets NL80211_FEATURE_SAE as well.
src/wiphy.c enum ie_rsn_akm_suite wiphy_select_akm(struct wiphy *wiphy, · line 200
Quoted 3 lines
src/wiphy.c +0
-2*/ -if (!wiphy_has_feature (wiphy,NL80211_FEATURE_SAE ) || - !wiphy->support_cmds_auth_assoc) {
The original code here seems to cover the above case...
src/wiphy.c enum ie_rsn_akm_suite wiphy_select_akm(struct wiphy *wiphy, · line 196
Quoted 3 lines
src/wiphy.c +1
-2-l_debug ("No HW WPA3 support, trying WPA2" ); - goto wpa2_personal; +if (!wiphy_has_feature (wiphy,NL80211_FEATURE_SAE )) {
And this looks like it would allow qtnfmac through...
src/wiphy.c enum ie_rsn_akm_suite wiphy_select_akm(struct wiphy *wiphy, · line 200
Quoted 4 lines
src/wiphy.c +4
-0+if (!wiphy_has_ext_feature (wiphy, +NL80211_EXT_FEATURE_SAE_OFFLOAD ) && + !wiphy->support_cmds_auth_assoc) + goto wpa2_personal;
Perhaps all this mess needs to be moved into a separate function with all these details explained.
To me it looks like there's 3 paths:
1. SoftMac case:
FEATURE_SAE && wiphy_supports_cmds_auth_assoc == true
2. Non-Offloaded case via CMD_EXTERNAL_AUTH
FEATURE_SAE && wiphy_supports_cmds_auth_assoc == false
3. Offloaded case:
!FEATURE_SAE && FEATURE_EXT_SAE_OFFLOAD && wiphy_supports_cmds_auth_assoc == false
And then maybe in the case of brcmfmac it supports case 2 without setting FEATURE_SAE.
Total mess as there seems to be no way to check for external auth support.
src/wiphy.c enum ie_rsn_akm_suite wiphy_select_akm(struct wiphy *wiphy, · line 203
Quoted 4 lines
src/wiphy.c +0
-0} if (info.akm_suites &
Regards,
-Denis
PATCH 3/6 wiphy: check SAE offload in wiphy_can_connect
In reply to James PrestwoodThis allows this wiphy_can_connect to pass for an SAE BSS if the hardware does not support user space SAE, but does support SAE offload.
--- src/wiphy.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)
src/wiphy.c +10 -7
@@ -376,15 +376,18 @@ bool wiphy_can_connect(struct wiphy *wiphy, struct scan_bss *bss)case IE_RSN_AKM_SUITE_FT_OVER_SAE_SHA256 :/* * if the AP ONLY supports SAE/WPA3, then we can only -* connect if the wiphy feature is supported. Otherwise -* the AP may list SAE as one of the AKM's but also -* support PSK (hybrid). In this case we still want to -* allow a connection even if SAE is not supported. +* connect if the wiphy either supports userspace SAE or +* SAE offload. Otherwise the AP may list SAE as one of +* the AKM's but also support PSK (hybrid). In this case +* we still want to allow a connection even if SAE is +* not supported. */ -if (!wiphy_has_feature (wiphy,NL80211_FEATURE_SAE ) || +if (!wiphy_has_feature (wiphy,NL80211_FEATURE_SAE )) { +if (!wiphy_has_ext_feature (wiphy, +NL80211_EXT_FEATURE_SAE_OFFLOAD ) && !wiphy->support_cmds_auth_assoc) -return false; - +return false; + }break ;case IE_RSN_AKM_SUITE_OWE :case IE_RSN_AKM_SUITE_FILS_SHA256 :
Signature · 1 line
2.26.2
PATCH 4/6 handshake: add offload flag
In reply to James PrestwoodIf true, this flag indicates the handshake is being offloaded to the kernel/hardware.
--- src/handshake.h | 1 + 1 file changed, 1 insertion(+)
src/handshake.h +1 -0
@@ -116,6 +116,7 @@ struct handshake_state { bool wait_for_gtk : 1; bool no_rekey : 1; bool support_fils : 1; + bool offload : 1;uint8_t ssid[32 ];size_t ssid_len;char *passphrase;
Signature · 1 line
2.26.2
PATCH 5/6 netdev: add SAE offload support
In reply to James PrestwoodSAE offload support requires some minor tweaks to CMD_CONNECT as well as special checks once the connect event comes in. Since at this point we are fully connected.
--- src/netdev.c | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-)
src/netdev.c +28 -3
@@ -1979,6 +1979,13 @@ process_resp_ies:netdev_send_qos_map_set (netdev, qos_set, qos_len); } +/* +* A successful connect event using offload means IWD is fully +* connected and completed the 4-way handshake +*/ +if (netdev->handshake->offload) + goto done; +if (netdev->sm) {/* * Let station know about the roam so a state change can occur.
@@ -2002,6 +2009,7 @@ process_resp_ies:return ; } +done:netdev_connect_ok (netdev);return ;
@@ -2601,7 +2609,9 @@ static struct l_genl_msg *netdev_build_cmd_connect(struct netdev *netdev,const struct iovec *vendor_ies, size_t num_vendor_ies) { - uint32_t auth_type = NL80211_AUTHTYPE_OPEN_SYSTEM; + uint32_t auth_type = IE_AKM_IS_SAE(hs->akm_suite) ? +NL80211_AUTHTYPE_SAE : +NL80211_AUTHTYPE_OPEN_SYSTEM ;struct l_genl_msg *msg;struct iovec iov[4 + num_vendor_ies];int iov_elems =0 ;
@@ -2618,6 +2628,15 @@ static struct l_genl_msg *netdev_build_cmd_connect(struct netdev *netdev, bss->ssid_len, bss->ssid);l_genl_msg_append_attr (msg,NL80211_ATTR_AUTH_TYPE ,4 , &auth_type); +if (hs->offload) { +l_genl_msg_append_attr (msg,NL80211_ATTR_EXTERNAL_AUTH_SUPPORT , +0 ,NULL ); + +if (IE_AKM_IS_SAE (hs->akm_suite)) +l_genl_msg_append_attr (msg,NL80211_ATTR_SAE_PASSWORD , +strlen (hs->passphrase), hs->passphrase); + } +if (prev_bssid)l_genl_msg_append_attr (msg,NL80211_ATTR_PREV_BSSID ,ETH_ALEN , prev_bssid);
@@ -2659,7 +2678,9 @@ static struct l_genl_msg *netdev_build_cmd_connect(struct netdev *netdev,l_genl_msg_append_attr (msg,NL80211_ATTR_AKM_SUITES ,4 , &nl_akm); -if (hs->wpa_ie) +if (IE_AKM_IS_SAE (hs->akm_suite)) + wpa_version =NL80211_WPA_VERSION_3 ; +else if (hs->wpa_ie) wpa_version =NL80211_WPA_VERSION_1 ;else wpa_version =NL80211_WPA_VERSION_2 ;
@@ -3020,6 +3041,9 @@ int netdev_connect(struct netdev *netdev, struct scan_bss *bss,switch (hs->akm_suite) {case IE_RSN_AKM_SUITE_SAE_SHA256 :case IE_RSN_AKM_SUITE_FT_OVER_SAE_SHA256 : +if (hs->offload) + goto build_cmd_connect; + netdev->ap =sae_sm_new (hs, netdev_sae_tx_authenticate, netdev_sae_tx_associate, netdev);
@@ -3038,13 +3062,14 @@ int netdev_connect(struct netdev *netdev, struct scan_bss *bss, netdev);break ;default : +build_cmd_connect: cmd_connect =netdev_build_cmd_connect (netdev, bss, hs,NULL , vendor_ies, num_vendor_ies);if (!cmd_connect)return -EINVAL ; -if (is_rsn || hs->settings_8021x) +if (!hs->offload && (is_rsn || hs->settings_8021x)) sm =eapol_sm_new (hs); }
Signature · 1 line
2.26.2
Re: [PATCH 5/6] netdev: add SAE offload support
Hi James,
Quoted 12 lines · James Prestwood
SAE offload support requires some minor tweaks to
CMD_CONNECTas well as special checks once the connect event comes in. Since at this point we are fully connected.--- src/netdev.c | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-)src/netdev.c +0
-0
src/netdev.c process_resp_ies: · line 1988
Quoted 10 lines
src/netdev.c +7
-0@@ -1979,6 +1979,13 @@ process_resp_ies:netdev_send_qos_map_set (netdev, qos_set, qos_len); } +/* +* A successful connect event using offload means IWD is fully +* connected and completed the 4-way handshake +*/ +if (netdev->handshake->offload) + goto done; +
So we only offload SAE connections, right? Otherwise for 802.1X + HS offload this may be incorrect...
Quoted 3 lines
src/netdev.c +0
-0if (netdev->sm) {/* * Let station know about the roam so a state change can occur.
<snip>
src/netdev.c static struct l_genl_msg *netdev_build_cmd_connect(struct netdev *netdev, · line 2634
Quoted 8 lines
src/netdev.c +4
-0@@ -2618,6 +2628,15 @@ static struct l_genl_msg *netdev_build_cmd_connect(struct netdev *netdev, bss->ssid_len, bss->ssid);l_genl_msg_append_attr (msg,NL80211_ATTR_AUTH_TYPE ,4 , &auth_type); +if (hs->offload) { +l_genl_msg_append_attr (msg,NL80211_ATTR_EXTERNAL_AUTH_SUPPORT , +0 ,NULL ); +
Hmm, this part looks suspicious? See my reply to patch 2?
src/netdev.c static struct l_genl_msg *netdev_build_cmd_connect(struct netdev *netdev, · line 2642
Quoted 8 lines
src/netdev.c +5
-0+if (IE_AKM_IS_SAE (hs->akm_suite)) +l_genl_msg_append_attr (msg,NL80211_ATTR_SAE_PASSWORD , +strlen (hs->passphrase), hs->passphrase); + } +if (prev_bssid)l_genl_msg_append_attr (msg,NL80211_ATTR_PREV_BSSID ,ETH_ALEN , prev_bssid);
Regards,
-Denis
Re: [PATCH 5/6] netdev: add SAE offload support
Quoted 45 lines · Denis Kenzior
Hi James,
Quoted 13 lines · James Prestwood
SAE offload support requires some minor tweaks to
CMD_CONNECTas well as special checks once the connect event comes in. Since at this point we are fully connected.--- src/netdev.c | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-)src/netdev.c +0
-0@@ -1979,6 +1979,13 @@ process_resp_ies: netdev_send_qos_map_set(netdev, qos_set,src/netdev.c process_resp_ies: · line 1989
Quoted 10 lines
src/netdev.c +7
-0qos_len); } +/* +* A successful connect event using offload means IWD is fully +* connected and completed the 4-way handshake +*/ +if (netdev->handshake->offload) + goto done; +So we only offload SAE connections, right? Otherwise for 802.1X + HS offload
this may be incorrect...Quoted 4 lines
src/netdev.c +0
-0if (netdev->sm) {/* * Let station know about the roam so a state change
can occur.<snip>
Quoted 7 lines
src/netdev.c +0
-0@@ -2618,6 +2628,15 @@ static struct l_genl_msg *netdev_build_cmd_connect(struct netdev *netdev, bss->ssid_len, bss- >ssid);l_genl_msg_append_attr (msg,NL80211_ATTR_AUTH_TYPE ,4 , &auth_type);
Quoted 7 lines
src/netdev.c
Quoted 5 lines
src/netdev.c +2
-0+if (hs->offload) { + l_genl_msg_append_attr(msg,
NL80211_ATTR_EXTERNAL_AUTH_SUPPORT,src/netdev.c +2
-0+ 0, NULL); +Hmm, this part looks suspicious? See my reply to patch 2?
Yeah I misread the docs, as well as followed how wpa_s does it (which includes this) but its not needed. With respect to your other comments I think I'll punt on EXTERNAL_AUTH for now since I have no way of testing it and only one driver actually uses it.
Quoted 15 lines
Quoted 10 lines
src/netdev.c +2
-0+if (IE_AKM_IS_SAE (hs->akm_suite)) + l_genl_msg_append_attr(msg,
NL80211_ATTR_SAE_PASSWORD,src/netdev.c +1
-0+ strlen(hs->passphrase), hs-Quoted 1 line
passphrase);
src/netdev.c +2
-0+ } +if (prev_bssid) l_genl_msg_append_attr(msg, NL80211_ATTR_PREV_BSSID,Quoted 2 lines
ETH_ALEN,
prev_bssid);Regards,
-Denis
Re: [PATCH 5/6] netdev: add SAE offload support
In reply to Denis KenziorQuoted 19 lines · Denis Kenzior
Hi James,
Quoted 16 lines · James Prestwood
SAE offload support requires some minor tweaks to
CMD_CONNECTas well as special checks once the connect event comes in. Since at this point we are fully connected.--- src/netdev.c | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-)src/netdev.c +0
-0@@ -1979,6 +1979,13 @@ process_resp_ies:netdev_send_qos_map_set (netdev, qos_set, qos_len); }
Quoted 11 lines
src/netdev.c process_resp_ies: · line 1988
Quoted 7 lines
src/netdev.c +7
-0+/* +* A successful connect event using offload means IWD is fully +* connected and completed the 4-way handshake +*/ +if (netdev->handshake->offload) + goto done; +So we only offload SAE connections, right? Otherwise for 802.1X + HS offload
this may be incorrect...
Yes, but this should only get set if we are actually doing offloading, which we don't yet support for 1x/PSK. I havent dove into this yet, but what would the procedure be here for 1x offloading (theoretically)?
Now in light of CMD_EXTERNAL_AUTH the code below in a previous patch needs to change to account for this:
if (!wiphy_supports_cmds_auth_assoc(wiphy))
hs->offload = true;
But as far as this check goes I don't see an issue unless you think 8021x offload has more handling that needs to be done. I'm not exactly sure how much of 1x is offloaded (auth/assoc?, EAP?, 4-way? all?)
Quoted 37 lines
Quoted 5 lines
src/netdev.c +0
-0if (netdev->sm) {/* * Let station know about the roam so a state change
can occur.<snip>
src/netdev.c
Quoted 12 lines
src/netdev.c +2
-0@@ -2618,6 +2628,15 @@ static struct l_genl_msg *netdev_build_cmd_connect(struct netdev *netdev, bss->ssid_len, bss- >ssid);l_genl_msg_append_attr (msg,NL80211_ATTR_AUTH_TYPE ,4 , &auth_type); +if (hs->offload) { + l_genl_msg_append_attr(msg,
NL80211_ATTR_EXTERNAL_AUTH_SUPPORT,src/netdev.c +2
-0+ 0, NULL); +Hmm, this part looks suspicious? See my reply to patch 2?
Quoted 11 lines
src/netdev.c +2
-0+if (IE_AKM_IS_SAE (hs->akm_suite)) + l_genl_msg_append_attr(msg,
NL80211_ATTR_SAE_PASSWORD,src/netdev.c +1
-0+ strlen(hs->passphrase), hs-Quoted 1 line
passphrase);
src/netdev.c +2
-0+ } +if (prev_bssid) l_genl_msg_append_attr(msg, NL80211_ATTR_PREV_BSSID,
ETH_ALEN,
prev_bssid);Regards,
-Denis
Re: [PATCH 5/6] netdev: add SAE offload support
Hi James,
Quoted 7 lines
Quoted 3 lines
So we only offload SAE connections, right? Otherwise for 802.1X + HS offload
this may be incorrect...Yes, but this should only get set if we are actually doing offloading, which we don't yet support for 1x/PSK. I havent dove into this yet, but what would the procedure be here for 1x offloading (theoretically)?
Ok, figured. I was just wondering if this warrants a TODO or a comment.
1X cannot be offloaded. Only the 4way handshake can. So in theory, if we're offloading the 4way handshake, we still need to go through eapol for the 802.1X part. And once that is successful, then we issue NL80211_CMD_SET_PMK to tell the driver that 802.1X succeeded. Not sure whether we get an event after the driver completes the handshake?
Quoted 10 lines
Now in light of
CMD_EXTERNAL_AUTHthe code below in a previous patch needs to change to account for this:if (!wiphy_supports_cmds_auth_assoc(wiphy))
hs->offload = true;But as far as this check goes I don't see an issue unless you think 8021x offload has more handling that needs to be done. I'm not exactly sure how much of 1x is offloaded (auth/assoc?, EAP?, 4-way? all?)
Auth/Assoc is offloaded to the driver, 1X is done by userspace, 4-way is then done by the driver.
Regards,
-Denis
PATCH 6/6 station: set handshake offload if required
In reply to James PrestwoodIf IWD is connecting to a SAE/WPA3 BSS and Auth/Assoc commands are not supported the only option is SAE offload. At this point network_connect should have verified that the extended feature for SAE offload exists so we can simply enable offload if these commands are not supported.
--- src/station.c | 4 ++++ 1 file changed, 4 insertions(+)
src/station.c +4 -0
@@ -979,6 +979,10 @@ static struct handshake_state *station_handshake_setup(struct station *station, goto no_psk;handshake_state_set_passphrase (hs, passphrase); + +/* SAE offload required */ +if (!wiphy_supports_cmds_auth_assoc (wiphy)) + hs->offload = true; }else {const uint8_t *psk =network_get_psk (network);
Signature · 1 line
2.26.2