netdev: factor out scan_bss from CMD_CONNECT builder
PATCH v2 1/3 netdev: factor out scan_bss from CMD_CONNECT builder
In order to support OWE in the CMD_CONNECT path the scan_bss parameter needs to be removed since this is lost after netdev_connect returns. Nearly everything needed is also stored in the handshake except the privacy capability which is now being mirrored in the netdev object itself.
--- src/netdev.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-)
src/netdev.c +12 -11
@@ -181,6 +181,7 @@ struct netdev { bool events_ready : 1; bool retry_auth : 1; bool in_reassoc : 1; + bool privacy : 1; };struct netdev_preauth_state {
@@ -788,6 +789,7 @@ static void netdev_connect_free(struct netdev *netdev) netdev->ignore_connect_event = false; netdev->expect_connect_failure = false; netdev->cur_rssi_low = false; + netdev->privacy = false;if (netdev->connect_cmd) {l_genl_msg_unref (netdev->connect_cmd);
@@ -2901,7 +2903,6 @@ static void netdev_fils_tx_associate(struct iovec *fils_iov, size_t n_fils_iov, } static struct l_genl_msg *netdev_build_cmd_connect(struct netdev *netdev, - struct scan_bss *bss, struct handshake_state *hs, const uint8_t *prev_bssid, const struct iovec *vendor_ies,
@@ -2924,10 +2925,9 @@ static struct l_genl_msg *netdev_build_cmd_connect(struct netdev *netdev, msg =l_genl_msg_new_sized (NL80211_CMD_CONNECT ,512 );l_genl_msg_append_attr (msg,NL80211_ATTR_IFINDEX ,4 , &netdev->index);l_genl_msg_append_attr (msg,NL80211_ATTR_WIPHY_FREQ , -4 , &bss->frequency); -l_genl_msg_append_attr (msg,NL80211_ATTR_MAC ,ETH_ALEN , bss->addr); -l_genl_msg_append_attr (msg,NL80211_ATTR_SSID , - bss->ssid_len, bss->ssid); +4 , &netdev->frequency); +l_genl_msg_append_attr (msg,NL80211_ATTR_MAC ,ETH_ALEN , hs->aa); +l_genl_msg_append_attr (msg,NL80211_ATTR_SSID , hs->ssid_len, hs->ssid);l_genl_msg_append_attr (msg,NL80211_ATTR_AUTH_TYPE ,4 , &auth_type);switch (nhs->type) {
@@ -2950,7 +2950,7 @@ static struct l_genl_msg *netdev_build_cmd_connect(struct netdev *netdev,l_genl_msg_append_attr (msg,NL80211_ATTR_PREV_BSSID ,ETH_ALEN , prev_bssid); -if (bss->capability &IE_BSS_CAP_PRIVACY ) +if (netdev->privacy)l_genl_msg_append_attr (msg,NL80211_ATTR_PRIVACY ,0 ,NULL );l_genl_msg_append_attr (msg,NL80211_ATTR_SOCKET_OWNER ,0 ,NULL );
@@ -3476,6 +3476,10 @@ static void netdev_connect_common(struct netdev *netdev,bool is_rsn = hs->supplicant_ie !=NULL ;const uint8_t *prev_bssid = prev_bss ? prev_bss->addr :NULL ; + netdev->frequency = bss->frequency; + netdev->privacy = bss->capability &IE_BSS_CAP_PRIVACY ; +handshake_state_set_authenticator_address (hs, bss->addr); +if (!is_rsn) goto build_cmd_connect;
@@ -3519,8 +3523,8 @@ static void netdev_connect_common(struct netdev *netdev,break ;default : build_cmd_connect: - cmd_connect =netdev_build_cmd_connect (netdev, bss, hs, - prev_bssid, vendor_ies, num_vendor_ies); + cmd_connect =netdev_build_cmd_connect (netdev, hs, prev_bssid, + vendor_ies, num_vendor_ies);if (!is_offload (hs) && (is_rsn || hs->settings_8021x)) { sm =eapol_sm_new (hs);
@@ -3536,13 +3540,10 @@ build_cmd_connect: netdev->user_data = user_data; netdev->handshake = hs; netdev->sm = sm; - netdev->frequency = bss->frequency; netdev->cur_rssi = bss->signal_strength /100 ;netdev_rssi_level_init (netdev);netdev_cqm_rssi_update (netdev); -handshake_state_set_authenticator_address (hs, bss->addr); -if (!wiphy_has_ext_feature (netdev->wiphy,NL80211_EXT_FEATURE_CAN_REPLACE_PTK0 ))handshake_state_set_no_rekey (hs, true);
Signature · 1 line
2.31.1
PATCH v2 2/3 wsc: set ssid in handshake
netdev now assumes the SSID was set in the handshake (normally via network_handshake_setup) but WSC calls netdev_connect directly so it also should set the SSID.
--- src/wsc.c | 1 + 1 file changed, 1 insertion(+)
src/wsc.c +1 -0
@@ -356,6 +356,7 @@ static int wsc_enrollee_connect(struct wsc_enrollee *wsce, struct scan_bss *bss,handshake_state_set_event_func (hs, wsc_enrollee_handshake_event, wsce);handshake_state_set_8021x_config (hs, settings); +handshake_state_set_ssid (hs, bss->ssid, bss->ssid_len); wsce->eap_settings = settings; request.version2 = true;
Signature · 1 line
2.31.1
PATCH v2 3/3 owe: netdev: refactor to remove OWE as an auth-proto
In reply to James Prestwood--- src/netdev.c | 545 +++++++++++++++++++++++++++------------------------ src/netdev.h | 1 + src/owe.c | 148 ++------------ src/owe.h | 12 +- 4 files changed, 313 insertions(+), 393 deletions(-)
v2:
* Move OWE AKM case after the potential to go to psk_offload.
* use existing eapol_sm_new rather than creating the SM later
src/netdev.c +292 -253
@@ -119,6 +119,7 @@ struct netdev {void *user_data;struct eapol_sm *sm;struct auth_proto *ap; +struct owe_sm *owe_sm;struct handshake_state *handshake;uint32_t connect_cmd_id;uint32_t disconnect_cmd_id;
@@ -752,6 +753,11 @@ static void netdev_connect_free(struct netdev *netdev) netdev->ap =NULL ; } +if (netdev->owe_sm) { +owe_sm_free (netdev->owe_sm); + netdev->owe_sm =NULL ; + } +eapol_preauth_cancel (netdev->index);if (netdev->handshake) {
@@ -2094,6 +2100,228 @@ static void netdev_driver_connected(struct netdev *netdev)eapol_register (netdev->sm); } +static unsigned int ie_rsn_akm_suite_to_nl80211 (enum ie_rsn_akm_suite akm) +{ +switch (akm) { +case IE_RSN_AKM_SUITE_8021X : +return CRYPTO_AKM_8021X ; +case IE_RSN_AKM_SUITE_PSK : +return CRYPTO_AKM_PSK ; +case IE_RSN_AKM_SUITE_FT_OVER_8021X : +return CRYPTO_AKM_FT_OVER_8021X ; +case IE_RSN_AKM_SUITE_FT_USING_PSK : +return CRYPTO_AKM_FT_USING_PSK ; +case IE_RSN_AKM_SUITE_8021X_SHA256 : +return CRYPTO_AKM_8021X_SHA256 ; +case IE_RSN_AKM_SUITE_PSK_SHA256 : +return CRYPTO_AKM_PSK_SHA256 ; +case IE_RSN_AKM_SUITE_TDLS : +return CRYPTO_AKM_TDLS ; +case IE_RSN_AKM_SUITE_SAE_SHA256 : +return CRYPTO_AKM_SAE_SHA256 ; +case IE_RSN_AKM_SUITE_FT_OVER_SAE_SHA256 : +return CRYPTO_AKM_FT_OVER_SAE_SHA256 ; +case IE_RSN_AKM_SUITE_AP_PEER_KEY_SHA256 : +return CRYPTO_AKM_AP_PEER_KEY_SHA256 ; +case IE_RSN_AKM_SUITE_8021X_SUITE_B_SHA256 : +return CRYPTO_AKM_8021X_SUITE_B_SHA256 ; +case IE_RSN_AKM_SUITE_8021X_SUITE_B_SHA384 : +return CRYPTO_AKM_8021X_SUITE_B_SHA384 ; +case IE_RSN_AKM_SUITE_FT_OVER_8021X_SHA384 : +return CRYPTO_AKM_FT_OVER_8021X_SHA384 ; +case IE_RSN_AKM_SUITE_FILS_SHA256 : +return CRYPTO_AKM_FILS_SHA256 ; +case IE_RSN_AKM_SUITE_FILS_SHA384 : +return CRYPTO_AKM_FILS_SHA384 ; +case IE_RSN_AKM_SUITE_FT_OVER_FILS_SHA256 : +return CRYPTO_AKM_FT_OVER_FILS_SHA256 ; +case IE_RSN_AKM_SUITE_FT_OVER_FILS_SHA384 : +return CRYPTO_AKM_FT_OVER_FILS_SHA384 ; +case IE_RSN_AKM_SUITE_OWE : +return CRYPTO_AKM_OWE ; +case IE_RSN_AKM_SUITE_OSEN : +return CRYPTO_AKM_OSEN ; + } + +return 0 ; +} + +static struct l_genl_msg *netdev_build_cmd_connect (struct netdev *netdev, +struct handshake_state *hs, +const uint8_t *prev_bssid, +const struct iovec *vendor_ies, +size_t num_vendor_ies) +{ +struct netdev_handshake_state *nhs = + l_container_of(hs, struct netdev_handshake_state, super); +uint32_t auth_type =IE_AKM_IS_SAE (hs->akm_suite) ? +NL80211_AUTHTYPE_SAE : +NL80211_AUTHTYPE_OPEN_SYSTEM ; +enum mpdu_management_subtype subtype = prev_bssid ? +MPDU_MANAGEMENT_SUBTYPE_REASSOCIATION_REQUEST : +MPDU_MANAGEMENT_SUBTYPE_ASSOCIATION_REQUEST ; +struct l_genl_msg *msg; +struct iovec iov[64 ]; +unsigned int n_iov =L_ARRAY_SIZE (iov); +unsigned int c_iov =0 ; +bool is_rsn = hs->supplicant_ie !=NULL ; +uint8_t owe_dh_ie[5 +L_ECC_SCALAR_MAX_BYTES ]; +size_t dh_ie_len; + + msg =l_genl_msg_new_sized (NL80211_CMD_CONNECT ,512 ); +l_genl_msg_append_attr (msg,NL80211_ATTR_IFINDEX ,4 , &netdev->index); +l_genl_msg_append_attr (msg,NL80211_ATTR_WIPHY_FREQ , +4 , &netdev->frequency); +l_genl_msg_append_attr (msg,NL80211_ATTR_MAC ,ETH_ALEN , hs->aa); +l_genl_msg_append_attr (msg,NL80211_ATTR_SSID , hs->ssid_len, hs->ssid); +l_genl_msg_append_attr (msg,NL80211_ATTR_AUTH_TYPE ,4 , &auth_type); + +switch (nhs->type) { +case CONNECTION_TYPE_SOFTMAC : +case CONNECTION_TYPE_FULLMAC : +break ; +case CONNECTION_TYPE_SAE_OFFLOAD : +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 ; +case CONNECTION_TYPE_8021X_OFFLOAD : +l_genl_msg_append_attr (msg,NL80211_ATTR_WANT_1X_4WAY_HS , +0 ,NULL ); + } + +if (prev_bssid) +l_genl_msg_append_attr (msg,NL80211_ATTR_PREV_BSSID ,ETH_ALEN , + prev_bssid); + +if (netdev->privacy) +l_genl_msg_append_attr (msg,NL80211_ATTR_PRIVACY ,0 ,NULL ); + +l_genl_msg_append_attr (msg,NL80211_ATTR_SOCKET_OWNER ,0 ,NULL ); + +if (is_rsn) { +uint32_t nl_cipher; +uint32_t nl_akm; +uint32_t wpa_version; + +if (hs->pairwise_cipher ==IE_RSN_CIPHER_SUITE_CCMP ) + nl_cipher =CRYPTO_CIPHER_CCMP ; +else + nl_cipher =CRYPTO_CIPHER_TKIP ; + +l_genl_msg_append_attr (msg,NL80211_ATTR_CIPHER_SUITES_PAIRWISE , +4 , &nl_cipher); + +if (hs->group_cipher ==IE_RSN_CIPHER_SUITE_CCMP ) + nl_cipher =CRYPTO_CIPHER_CCMP ; +else + nl_cipher =CRYPTO_CIPHER_TKIP ; + +l_genl_msg_append_attr (msg,NL80211_ATTR_CIPHER_SUITE_GROUP , +4 , &nl_cipher); + +if (hs->mfp) { +uint32_t use_mfp =NL80211_MFP_REQUIRED ; +l_genl_msg_append_attr (msg,NL80211_ATTR_USE_MFP , +4 , &use_mfp); + } + + nl_akm =ie_rsn_akm_suite_to_nl80211 (hs->akm_suite); +if (nl_akm) +l_genl_msg_append_attr (msg,NL80211_ATTR_AKM_SUITES , +4 , &nl_akm); + +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 ; + +l_genl_msg_append_attr (msg,NL80211_ATTR_WPA_VERSIONS , +4 , &wpa_version); + +l_genl_msg_append_attr (msg,NL80211_ATTR_CONTROL_PORT ,0 ,NULL ); + c_iov =iov_ie_append (iov, n_iov, c_iov, hs->supplicant_ie); + } + +if (netdev->owe_sm) { +owe_build_dh_ie (netdev->owe_sm, owe_dh_ie, &dh_ie_len); + c_iov =iov_ie_append (iov, n_iov, c_iov, owe_dh_ie); + } + +if (netdev->pae_over_nl80211) +l_genl_msg_append_attr (msg, +NL80211_ATTR_CONTROL_PORT_OVER_NL80211 , +0 ,NULL ); + + c_iov =iov_ie_append (iov, n_iov, c_iov, hs->mde); + c_iov =netdev_populate_common_ies (netdev, hs, msg, iov, n_iov, c_iov); + +mpdu_sort_ies (subtype, iov, c_iov); + +if (vendor_ies && !L_WARN_ON (n_iov - c_iov < num_vendor_ies)) { +memcpy (iov + c_iov, vendor_ies, +sizeof (*vendor_ies) * num_vendor_ies); + c_iov += num_vendor_ies; + } + +if (c_iov) +l_genl_msg_append_attrv (msg,NL80211_ATTR_IE , iov, c_iov); + +return msg; +} + +static void netdev_cmd_connect_cb (struct l_genl_msg *msg,void *user_data) +{ +struct netdev *netdev = user_data; + + netdev->connect_cmd_id =0 ; + +if (l_genl_msg_get_error (msg) >=0 ) { +/* +* connected should be false if the connect event hasn't come +* in yet. i.e. the CMD_CONNECT ack arrived first (typical). +* Mark the connection as 'connected' +*/ +if (!netdev->connected) +netdev_driver_connected (netdev); + +return ; + } + +netdev_connect_failed (netdev,NETDEV_RESULT_ASSOCIATION_FAILED , +MMPDU_STATUS_CODE_UNSPECIFIED ); +} + +static bool netdev_retry_owe (struct netdev *netdev) +{ +struct iovec iov; + +if (!owe_next_group (netdev->owe_sm)) +return false; + + iov.iov_base = netdev->handshake->vendor_ies; + iov.iov_len = netdev->handshake->vendor_ies_len; + + netdev->connect_cmd =netdev_build_cmd_connect (netdev, + netdev->handshake,NULL , &iov,1 ); + + netdev->connect_cmd_id =l_genl_family_send (nl80211, + netdev->connect_cmd, + netdev_cmd_connect_cb, netdev, +NULL ); + +if (!netdev->connect_cmd_id) +return false; + + netdev->connect_cmd =NULL ; + +return true; +} +static void netdev_connect_event (struct l_genl_msg *msg,struct netdev *netdev) {struct l_genl_attr attr;
@@ -2162,6 +2390,14 @@ static void netdev_connect_event(struct l_genl_msg *msg, struct netdev *netdev) goto error; } +if (netdev->owe_sm && status_code && *status_code == +MMPDU_STATUS_CODE_UNSUPP_FINITE_CYCLIC_GROUP ) { +if (!netdev_retry_owe (netdev)) + goto error; + +return ; + } +/* AP Rejected the authenticate / associate */ if (!status_code || *status_code !=0 ) goto error;
@@ -2175,8 +2411,12 @@ process_resp_ies:if (resp_ies) {const uint8_t *fte =NULL ;const uint8_t *qos_set =NULL ; +const uint8_t *owe_dh =NULL ; +size_t owe_dh_len =0 ;size_t qos_len =0 ;struct ie_ft_info ft_info; +struct ie_rsn_info info; +bool owe_akm_found = false;ie_tlv_iter_init (&iter, resp_ies, resp_ies_len);
@@ -2203,7 +2443,53 @@ process_resp_ies: data -3 , ie_tlv_iter_get_length(&iter) + 3);break ; +case IE_TYPE_OWE_DH_PARAM : +if (!netdev->owe_sm) +continue ; + + owe_dh = data; + owe_dh_len = len; + +break ; + +case IE_TYPE_RSN : +if (!netdev->owe_sm) +continue ; + +if (ie_parse_rsne (&iter, &info) <0 ) { +l_error ("could not parse RSN IE" ); + goto error; + } + +/* +* RFC 8110 Section 4.2 +* An AP agreeing to do OWE MUST include the OWE AKM in +* the RSN element portion of the 802.11 association +* response. +*/ +if (info.akm_suites !=IE_RSN_AKM_SUITE_OWE ) { +l_error ("OWE AKM not included" ); + goto error; + } + + owe_akm_found = true; + +break ; + } + } + +if (netdev->owe_sm) { +if (!owe_dh || !owe_akm_found) { +l_error ("OWE DH element/RSN not found" ); + goto error; } + +if (owe_process_dh_ie (netdev->owe_sm, owe_dh, + owe_dh_len) !=0 ) + goto error; + +owe_sm_free (netdev->owe_sm); + netdev->owe_sm =NULL ; }/* FILS handles its own FT key derivation */
@@ -2271,52 +2557,6 @@ deauth: netdev, NULL); } -static unsigned int ie_rsn_akm_suite_to_nl80211 (enum ie_rsn_akm_suite akm) -{ -switch (akm) { -case IE_RSN_AKM_SUITE_8021X : -return CRYPTO_AKM_8021X ; -case IE_RSN_AKM_SUITE_PSK : -return CRYPTO_AKM_PSK ; -case IE_RSN_AKM_SUITE_FT_OVER_8021X : -return CRYPTO_AKM_FT_OVER_8021X ; -case IE_RSN_AKM_SUITE_FT_USING_PSK : -return CRYPTO_AKM_FT_USING_PSK ; -case IE_RSN_AKM_SUITE_8021X_SHA256 : -return CRYPTO_AKM_8021X_SHA256 ; -case IE_RSN_AKM_SUITE_PSK_SHA256 : -return CRYPTO_AKM_PSK_SHA256 ; -case IE_RSN_AKM_SUITE_TDLS : -return CRYPTO_AKM_TDLS ; -case IE_RSN_AKM_SUITE_SAE_SHA256 : -return CRYPTO_AKM_SAE_SHA256 ; -case IE_RSN_AKM_SUITE_FT_OVER_SAE_SHA256 : -return CRYPTO_AKM_FT_OVER_SAE_SHA256 ; -case IE_RSN_AKM_SUITE_AP_PEER_KEY_SHA256 : -return CRYPTO_AKM_AP_PEER_KEY_SHA256 ; -case IE_RSN_AKM_SUITE_8021X_SUITE_B_SHA256 : -return CRYPTO_AKM_8021X_SUITE_B_SHA256 ; -case IE_RSN_AKM_SUITE_8021X_SUITE_B_SHA384 : -return CRYPTO_AKM_8021X_SUITE_B_SHA384 ; -case IE_RSN_AKM_SUITE_FT_OVER_8021X_SHA384 : -return CRYPTO_AKM_FT_OVER_8021X_SHA384 ; -case IE_RSN_AKM_SUITE_FILS_SHA256 : -return CRYPTO_AKM_FILS_SHA256 ; -case IE_RSN_AKM_SUITE_FILS_SHA384 : -return CRYPTO_AKM_FILS_SHA384 ; -case IE_RSN_AKM_SUITE_FT_OVER_FILS_SHA256 : -return CRYPTO_AKM_FT_OVER_FILS_SHA256 ; -case IE_RSN_AKM_SUITE_FT_OVER_FILS_SHA384 : -return CRYPTO_AKM_FT_OVER_FILS_SHA384 ; -case IE_RSN_AKM_SUITE_OWE : -return CRYPTO_AKM_OWE ; -case IE_RSN_AKM_SUITE_OSEN : -return CRYPTO_AKM_OSEN ; - } - -return 0 ; -} -static struct l_genl_msg *netdev_build_cmd_associate_common (struct netdev *netdev) {
@@ -2602,28 +2842,6 @@ assoc_failed: netdev->expect_connect_failure = true; } -static void netdev_cmd_connect_cb (struct l_genl_msg *msg,void *user_data) -{ -struct netdev *netdev = user_data; - - netdev->connect_cmd_id =0 ; - -if (l_genl_msg_get_error (msg) >=0 ) { -/* -* connected should be false if the connect event hasn't come -* in yet. i.e. the CMD_CONNECT ack arrived first (typical). -* Mark the connection as 'connected' -*/ -if (!netdev->connected) -netdev_driver_connected (netdev); - -return ; - } - -netdev_connect_failed (netdev,NETDEV_RESULT_ASSOCIATION_FAILED , -MMPDU_STATUS_CODE_UNSPECIFIED ); -} -static struct l_genl_msg *netdev_build_cmd_authenticate (struct netdev *netdev,uint32_t auth_type) {
@@ -2777,64 +2995,6 @@ static void netdev_sae_tx_associate(void *user_data) } } -static void netdev_owe_tx_authenticate (void *user_data) -{ -struct netdev *netdev = user_data; -struct l_genl_msg *msg; - - msg =netdev_build_cmd_authenticate (netdev, -NL80211_AUTHTYPE_OPEN_SYSTEM ); - -if (!l_genl_family_send (nl80211, msg, netdev_auth_cb, - netdev,NULL )) { -l_genl_msg_unref (msg); -netdev_connect_failed (netdev, -NETDEV_RESULT_AUTHENTICATION_FAILED , -MMPDU_STATUS_CODE_UNSPECIFIED ); -return ; - } - - netdev->auth_cmd =l_genl_msg_ref (msg); -} - -static void netdev_owe_tx_associate (struct iovec *owe_iov,size_t n_owe_iov, -void *user_data) -{ -struct netdev *netdev = user_data; -struct handshake_state *hs = netdev->handshake; -struct l_genl_msg *msg; -struct iovec iov[64 ]; -unsigned int n_iov =L_ARRAY_SIZE (iov); -unsigned int c_iov =0 ; -enum mpdu_management_subtype subtype = -MPDU_MANAGEMENT_SUBTYPE_ASSOCIATION_REQUEST ; - - msg =netdev_build_cmd_associate_common (netdev); - - c_iov =netdev_populate_common_ies (netdev, hs, msg, iov, n_iov, c_iov); - -if (!L_WARN_ON (n_iov - c_iov < n_owe_iov)) { -memcpy (iov + c_iov, owe_iov,sizeof (*owe_iov) * n_owe_iov); - c_iov += n_owe_iov; - } - -mpdu_sort_ies (subtype, iov, c_iov); - -l_genl_msg_append_attrv (msg,NL80211_ATTR_IE , iov, c_iov); - -/* If doing a non-FT Reassociation */ -if (netdev->in_reassoc) -l_genl_msg_append_attr (msg,NL80211_ATTR_PREV_BSSID ,6 , - netdev->ap->prev_bssid); - -if (!l_genl_family_send (nl80211, msg, netdev_assoc_cb, - netdev,NULL )) { -l_genl_msg_unref (msg); -netdev_connect_failed (netdev,NETDEV_RESULT_ASSOCIATION_FAILED , -MMPDU_STATUS_CODE_UNSPECIFIED ); - } -} -static void netdev_fils_tx_authenticate (const uint8_t *body,size_t body_len,void *user_data)
@@ -2902,127 +3062,6 @@ static void netdev_fils_tx_associate(struct iovec *fils_iov, size_t n_fils_iov, } } -static struct l_genl_msg *netdev_build_cmd_connect (struct netdev *netdev, -struct handshake_state *hs, -const uint8_t *prev_bssid, -const struct iovec *vendor_ies, -size_t num_vendor_ies) -{ -struct netdev_handshake_state *nhs = - l_container_of(hs, struct netdev_handshake_state, super); -uint32_t auth_type =IE_AKM_IS_SAE (hs->akm_suite) ? -NL80211_AUTHTYPE_SAE : -NL80211_AUTHTYPE_OPEN_SYSTEM ; -enum mpdu_management_subtype subtype = prev_bssid ? -MPDU_MANAGEMENT_SUBTYPE_REASSOCIATION_REQUEST : -MPDU_MANAGEMENT_SUBTYPE_ASSOCIATION_REQUEST ; -struct l_genl_msg *msg; -struct iovec iov[64 ]; -unsigned int n_iov =L_ARRAY_SIZE (iov); -unsigned int c_iov =0 ; -bool is_rsn = hs->supplicant_ie !=NULL ; - - msg =l_genl_msg_new_sized (NL80211_CMD_CONNECT ,512 ); -l_genl_msg_append_attr (msg,NL80211_ATTR_IFINDEX ,4 , &netdev->index); -l_genl_msg_append_attr (msg,NL80211_ATTR_WIPHY_FREQ , -4 , &netdev->frequency); -l_genl_msg_append_attr (msg,NL80211_ATTR_MAC ,ETH_ALEN , hs->aa); -l_genl_msg_append_attr (msg,NL80211_ATTR_SSID , hs->ssid_len, hs->ssid); -l_genl_msg_append_attr (msg,NL80211_ATTR_AUTH_TYPE ,4 , &auth_type); - -switch (nhs->type) { -case CONNECTION_TYPE_SOFTMAC : -case CONNECTION_TYPE_FULLMAC : -break ; -case CONNECTION_TYPE_SAE_OFFLOAD : -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 ; -case CONNECTION_TYPE_8021X_OFFLOAD : -l_genl_msg_append_attr (msg,NL80211_ATTR_WANT_1X_4WAY_HS , -0 ,NULL ); - } - -if (prev_bssid) -l_genl_msg_append_attr (msg,NL80211_ATTR_PREV_BSSID ,ETH_ALEN , - prev_bssid); - -if (netdev->privacy) -l_genl_msg_append_attr (msg,NL80211_ATTR_PRIVACY ,0 ,NULL ); - -l_genl_msg_append_attr (msg,NL80211_ATTR_SOCKET_OWNER ,0 ,NULL ); - -if (is_rsn) { -uint32_t nl_cipher; -uint32_t nl_akm; -uint32_t wpa_version; - -if (hs->pairwise_cipher ==IE_RSN_CIPHER_SUITE_CCMP ) - nl_cipher =CRYPTO_CIPHER_CCMP ; -else - nl_cipher =CRYPTO_CIPHER_TKIP ; - -l_genl_msg_append_attr (msg,NL80211_ATTR_CIPHER_SUITES_PAIRWISE , -4 , &nl_cipher); - -if (hs->group_cipher ==IE_RSN_CIPHER_SUITE_CCMP ) - nl_cipher =CRYPTO_CIPHER_CCMP ; -else - nl_cipher =CRYPTO_CIPHER_TKIP ; - -l_genl_msg_append_attr (msg,NL80211_ATTR_CIPHER_SUITE_GROUP , -4 , &nl_cipher); - -if (hs->mfp) { -uint32_t use_mfp =NL80211_MFP_REQUIRED ; -l_genl_msg_append_attr (msg,NL80211_ATTR_USE_MFP , -4 , &use_mfp); - } - - nl_akm =ie_rsn_akm_suite_to_nl80211 (hs->akm_suite); -if (nl_akm) -l_genl_msg_append_attr (msg,NL80211_ATTR_AKM_SUITES , -4 , &nl_akm); - -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 ; - -l_genl_msg_append_attr (msg,NL80211_ATTR_WPA_VERSIONS , -4 , &wpa_version); - -l_genl_msg_append_attr (msg,NL80211_ATTR_CONTROL_PORT ,0 ,NULL ); - c_iov =iov_ie_append (iov, n_iov, c_iov, hs->supplicant_ie); - } - -if (netdev->pae_over_nl80211) -l_genl_msg_append_attr (msg, -NL80211_ATTR_CONTROL_PORT_OVER_NL80211 , -0 ,NULL ); - - c_iov =iov_ie_append (iov, n_iov, c_iov, hs->mde); - c_iov =netdev_populate_common_ies (netdev, hs, msg, iov, n_iov, c_iov); - -mpdu_sort_ies (subtype, iov, c_iov); - -if (vendor_ies && !L_WARN_ON (n_iov - c_iov < num_vendor_ies)) { -memcpy (iov + c_iov, vendor_ies, -sizeof (*vendor_ies) * num_vendor_ies); - c_iov += num_vendor_ies; - } - -if (c_iov) -l_genl_msg_append_attrv (msg,NL80211_ATTR_IE , iov, c_iov); - -return msg; -} -struct rtnl_data {struct netdev *netdev;uint8_t addr[ETH_ALEN ];
@@ -3397,6 +3436,8 @@ static int netdev_handshake_state_setup_connection_type( NL80211_EXT_FEATURE_4WAY_HANDSHAKE_STA_PSK)) goto psk_offload; +/* fall through */ +case IE_RSN_AKM_SUITE_OWE :if (softmac) goto softmac;
@@ -3425,12 +3466,11 @@ static int netdev_handshake_state_setup_connection_type( goto softmac;return -EINVAL ; -case IE_RSN_AKM_SUITE_OWE :case IE_RSN_AKM_SUITE_FILS_SHA256 :case IE_RSN_AKM_SUITE_FILS_SHA384 :case IE_RSN_AKM_SUITE_FT_OVER_FILS_SHA256 :case IE_RSN_AKM_SUITE_FT_OVER_FILS_SHA384 : -/* FILS and OWE have no offload in any upstream driver */ +/* FILS has no offload in any upstream driver */ if (softmac) goto softmac;
@@ -3509,10 +3549,9 @@ static void netdev_connect_common(struct netdev *netdev,break ;case IE_RSN_AKM_SUITE_OWE : - netdev->ap =owe_sm_new (hs, netdev_owe_tx_authenticate, - netdev_owe_tx_associate, - netdev); -break ; + netdev->owe_sm =owe_sm_new (hs); + + goto build_cmd_connect;case IE_RSN_AKM_SUITE_FILS_SHA256 :case IE_RSN_AKM_SUITE_FILS_SHA384 :case IE_RSN_AKM_SUITE_FT_OVER_FILS_SHA256 :
src/netdev.h +1 -0
@@ -28,6 +28,7 @@ struct handshake_state;struct eapol_sm ;struct mmpdu_header ;struct diagnostic_station_info ; +struct owe_sm ;enum netdev_result {NETDEV_RESULT_OK ,
src/owe.c +15 -133
222 lines not on this page · raw message
src/owe.h +5 -7
@@ -23,11 +23,9 @@struct owe_sm ;struct handshake_state ; -typedef void (*owe_tx_authenticate_func_t )(void *user_data); -typedef void (*owe_tx_associate_func_t )(struct iovec *ie_iov,size_t iov_len, -void *user_data); +struct owe_sm *owe_sm_new (struct handshake_state *hs); +void owe_sm_free (struct owe_sm *sm); -struct auth_proto *owe_sm_new (struct handshake_state *hs, -owe_tx_authenticate_func_t auth, -owe_tx_associate_func_t assoc, -void *user_data); +void owe_build_dh_ie (struct owe_sm *sm,uint8_t *buf,size_t *len_out); +int owe_process_dh_ie (struct owe_sm *sm,const uint8_t *dh,size_t len); +bool owe_next_group (struct owe_sm *sm);
Signature · 1 line
2.31.1