bartoszek/zephyr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

driver: wifi: siwx91x: Handle MFP configuration

Browse Source 
- Handled MFP configuration for STA and AP modes
- Updated the MFP configuration based on security modes

Signed-off-by: Nitin Pandey <nitin.pandey@silabs.com>
This commit is contained in:
Nitin Pandey 2025-04-04 19:29:30 +05:30 committed by Benjamin Cabé
parent 0259bf56c8
commit 2b8af597ce
1 changed files with 82 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
drivers/wifi/siwx91x/siwx91x_wifi.c
View File

@ -71,6 +71,55 @@ static int siwx91x_map_ap_security(enum wifi_security_type security)
}
}
static enum wifi_mfp_options siwx91x_set_sta_mfp_option(sl_wifi_security_t security,
enum wifi_mfp_options mfp_conf)
{
uint8_t join_config;
switch (security) {
case SL_WIFI_OPEN:
case SL_WIFI_WPA:
return WIFI_MFP_DISABLE;
case SL_WIFI_WPA2:
case SL_WIFI_WPA_WPA2_MIXED:
if (mfp_conf == WIFI_MFP_REQUIRED) {
/* Handling the case for WPA2_SHA256 security type */
/* Directly enabling the MFP Required bit in the Join Feature
* bitmap. This ensures that MFP is enforced for connections using
* WPA2_SHA256.
*
* Note: This is a workaround to configure MFP as the current SDK
* does not provide a dedicated API to configure MFP settings.
* By manipulating the join feature bitmap directly, we achieve
* the desired MFP configuration for enhanced security.
*
* This case will be updated in the future when the SDK adds
* dedicated support for configuring MFP.
*/
sl_si91x_get_join_configuration(SL_WIFI_CLIENT_INTERFACE, &join_config);
join_config |= SL_SI91X_JOIN_FEAT_MFP_CAPABLE_REQUIRED;
sl_si91x_set_join_configuration(SL_WIFI_CLIENT_INTERFACE, join_config);
return WIFI_MFP_REQUIRED;
}
/* Handling the case for WPA2 security type */
/* Ensuring the connection happened in WPA2-PSK
* by clearing the MFP Required bit in the Join Feature bitmap.
*/
sl_si91x_get_join_configuration(SL_WIFI_CLIENT_INTERFACE, &join_config);
join_config &= ~(SL_SI91X_JOIN_FEAT_MFP_CAPABLE_REQUIRED);
sl_si91x_set_join_configuration(SL_WIFI_CLIENT_INTERFACE, join_config);
return WIFI_MFP_OPTIONAL;
case SL_WIFI_WPA3:
return WIFI_MFP_REQUIRED;
case SL_WIFI_WPA3_TRANSITION:
return WIFI_MFP_OPTIONAL;
default:
return WIFI_MFP_DISABLE;
}
return WIFI_MFP_UNKNOWN;
}
static unsigned int siwx91x_on_join(sl_wifi_event_t event,
char *result, uint32_t result_size, void *arg)
{
@ -157,6 +206,11 @@ static int siwx91x_ap_enable(const struct device *dev, struct wifi_connect_req_p
return -EINVAL;
}
if (params->mfp != WIFI_MFP_DISABLE) {
LOG_WRN("Needed MFP disable but got MFP %s, hence setting to MFP disable",
wifi_mfp_txt(params->mfp));
}
ret = sl_wifi_start_ap(SL_WIFI_AP_INTERFACE | SL_WIFI_2_4GHZ_INTERFACE, &siwx91x_ap_cfg);
if (ret != SL_STATUS_OK) {
LOG_ERR("Failed to enable AP mode: 0x%x", ret);
@ -245,7 +299,8 @@ static int siwx91x_connect(const struct device *dev, struct wifi_connect_req_par
.encryption = SL_WIFI_DEFAULT_ENCRYPTION,
.credential_id = SL_NET_DEFAULT_WIFI_CLIENT_CREDENTIAL_ID,
};
int ret;
enum wifi_mfp_options mfp_conf;
int ret = 0;
switch (params->security) {
case WIFI_SECURITY_TYPE_NONE:
@ -300,6 +355,17 @@ static int siwx91x_connect(const struct device *dev, struct wifi_connect_req_par
return -EINVAL;
}
if (params->security == WIFI_SECURITY_TYPE_PSK_SHA256) {
mfp_conf = siwx91x_set_sta_mfp_option(wifi_config.security, WIFI_MFP_REQUIRED);
} else {
mfp_conf = siwx91x_set_sta_mfp_option(wifi_config.security, params->mfp);
}
if (params->mfp != mfp_conf) {
LOG_WRN("Needed MFP %s but got MFP %s, hence setting to MFP %s",
wifi_mfp_txt(mfp_conf), wifi_mfp_txt(params->mfp), wifi_mfp_txt(mfp_conf));
}
if (params->channel != WIFI_CHANNEL_ANY) {
wifi_config.channel.channel = params->channel;
}
@ -491,6 +557,7 @@ static int siwx91x_status(const struct device *dev, struct wifi_iface_status *st
{
sl_si91x_rsp_wireless_info_t wlan_info = { };
struct siwx91x_dev *sidev = dev->data;
uint8_t join_config;
sl_wifi_interface_t interface;
int32_t rssi;
int ret;
@ -514,9 +581,22 @@ static int siwx91x_status(const struct device *dev, struct wifi_iface_status *st
strncpy(status->ssid, wlan_info.ssid, WIFI_SSID_MAX_LEN);
status->ssid_len = strlen(status->ssid);
memcpy(status->bssid, wlan_info.mac_address, WIFI_MAC_ADDR_LEN);
status->mfp = WIFI_MFP_UNKNOWN;
status->wpa3_ent_type = WIFI_WPA3_ENTERPRISE_NA;
ret = sl_si91x_get_join_configuration(interface, &join_config);
if (ret != SL_STATUS_OK) {
LOG_ERR("Failed to get join configuration: 0x%x", ret);
return -EINVAL;
}
if (join_config & SL_SI91X_JOIN_FEAT_MFP_CAPABLE_REQUIRED) {
status->mfp = WIFI_MFP_REQUIRED;
} else if (join_config & SL_SI91X_JOIN_FEAT_MFP_CAPABLE_ONLY) {
status->mfp = WIFI_MFP_OPTIONAL;
} else {
status->mfp = WIFI_MFP_DISABLE;
}
if (interface & SL_WIFI_2_4GHZ_INTERFACE) {
status->band = WIFI_FREQ_BAND_2_4_GHZ;
}