Skip to content
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

modules: hostap: Add support for WPA Auto security #14896

Merged
merged 3 commits into from
Apr 23, 2024
Merged

modules: hostap: Add support for WPA Auto security #14896

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9144cb6
modules: hostap: Add support for WPA Auto security
rado17 Apr 16, 2024
b96050c
doc: wifi: Update description for `connect` command
rado17 Apr 19, 2024
a7f2390
doc: Update changelog for Wi-Fi connect command update
rado17 Apr 22, 2024
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
5 changes: 4 additions & 1 deletion doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,7 +534,10 @@ Zigbee samples
Wi-Fi samples
-------------

|no_changes_yet_note|
* :ref:`wifi_shell_sample` sample:

* Modified ``connect`` command to provide better control over connection parameters.
* Added ``Auto-Security-Personal`` mode to the ``connect`` command.

Other samples
-------------
Expand Down
11 changes: 11 additions & 0 deletions modules/hostap/src/supp_api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,6 +365,17 @@ static int wpas_add_and_config_network(struct wpa_supplicant *wpa_s,
_wpa_cli_cmd_v("set_network %d proto WPA",
resp.network_id);
}
} else if (params->security == WIFI_SECURITY_TYPE_WPA_AUTO_PERSONAL) {
if (params->sae_password) {
_wpa_cli_cmd_v("set_network %d sae_password \"%s\"",
resp.network_id, params->sae_password);
}
_wpa_cli_cmd_v("set_network %d psk \"%s\"",
resp.network_id, params->psk);
_wpa_cli_cmd_v("set_network %d key_mgmt WPA-PSK WPA-PSK-SHA256 SAE",
resp.network_id);
_wpa_cli_cmd_v("set_network %d proto WPA RSN",
resp.network_id);
} else {
ret = -1;
wpa_printf(MSG_ERROR, "Unsupported security type: %d",
Expand Down
20 changes: 11 additions & 9 deletions samples/wifi/shell/README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,16 +114,18 @@ Supported CLI commands
| 2:1,6-11,14_5:36,149-165,44
| [-h, --help] : Print out the help for the scan command.
* - connect
- | Connect to a Wi-Fi AP with the following parameters:
| "<SSID>"
| [channel number/band: > 0:Channel, 0:any channel,
| < 0:band (-2:2.4GHz, -5:5GHz, -6:6GHz]
| [PSK: valid only for secure SSIDs]
| [Security type: valid only for secure SSIDs]
| 0:None, 1:WPA2-PSK, 2:WPA2-PSK-256, 3:SAE, 4:WAPI, 5:EAP, 6:WEP, 7:
| WPA-PSK
| [MFP (optional: needs security type to be specified)]
- | Connect to a Wi-Fi AP
| <-s --ssid \"<SSID>\">: SSID.
| [-c --channel]: Channel that needs to be scanned for connection. 0:any channel
| [-b, --band] 0: any band (2:2.4GHz, 5:5GHz, 6:6GHz)
| [-p, --psk]: Passphrase (valid only for secure SSIDs)
| [-k, --key-mgmt]: Key management type.
| 0:None, 1:WPA2-PSK, 2:WPA2-PSK-256, 3:SAE, 4:WAPI, 5:EAP, 6:WEP,
| 7:WPA-PSK, 8: WPA-Auto-Personal
| [-w, --ieee-80211w]: MFP (optional: needs security type to be specified)
| : 0:Disable, 1:Optional, 2:Required.
| [-m, --bssid]: MAC address of the AP (BSSID).
| [-h, --help]: Print out the help for the connect command.
* - disconnect
- Disconnect from the Wi-Fi AP
* - status
Expand Down
Loading