Skip to content

[PW_SID:1077103] netdev: use SAE PWE both for fullmac external auth #496

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
IWDTestBot wants to merge 1 commit into
base: workflow
Choose a base branch
from
Open

[PW_SID:1077103] netdev: use SAE PWE both for fullmac external auth #496

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/netdev.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2600,6 +2600,11 @@ static struct l_genl_msg *netdev_build_cmd_connect(struct netdev *netdev,
uint32_t auth_type = IE_AKM_IS_SAE(hs->akm_suite) && !hs->have_pmksa ?
NL80211_AUTHTYPE_SAE :
NL80211_AUTHTYPE_OPEN_SYSTEM;
uint8_t sae_pwe = nhs->type == CONNECTION_TYPE_FULLMAC &&
IE_AKM_IS_SAE(hs->akm_suite) &&
!hs->have_pmksa ?
NL80211_SAE_PWE_BOTH :
NL80211_SAE_PWE_UNSPECIFIED;
enum mpdu_management_subtype subtype = prev_bssid ?
MPDU_MANAGEMENT_SUBTYPE_REASSOCIATION_REQUEST :
MPDU_MANAGEMENT_SUBTYPE_ASSOCIATION_REQUEST;
Expand All @@ -2618,6 +2623,8 @@ static struct l_genl_msg *netdev_build_cmd_connect(struct netdev *netdev,
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);
if (sae_pwe != NL80211_SAE_PWE_UNSPECIFIED)
l_genl_msg_append_attr(msg, NL80211_ATTR_SAE_PWE, 1, &sae_pwe);

switch (nhs->type) {
case CONNECTION_TYPE_SOFTMAC:
Expand Down Expand Up @@ -4218,7 +4225,6 @@ static void netdev_connect_common(struct netdev *netdev,
netdev_external_auth_sae_tx_associate,
netdev);
sae_sm_force_default_group(netdev->ap);
sae_sm_force_hunt_and_peck(netdev->ap);
}

if (sae_sm_is_h2e(netdev->ap)) {
Expand Down
Loading