alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/repeated_ftm_failures_issue_v4.3' into 'release/v4.3'

Browse Source 
Combined bugfixes related to FTM and PMF (Backport v4.3)

See merge request espressif/esp-idf!16129
This commit is contained in:
Jiang Jiang Jian 2022-03-16 11:00:24 +08:00
commit 70c737af4d
9 changed files with 40 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/esp_wifi/include/esp_wifi_types.h
View File

@ -218,7 +218,7 @@ typedef enum {
/** Configuration structure for Protected Management Frame */
typedef struct {
bool capable; /**< Advertizes support for Protected Management Frame. Device will prefer to connect in PMF mode if other device also advertizes PMF capability. */
bool capable; /**< Deprecated variable. Device will always connect in PMF mode if other device also advertizes PMF capability. */
bool required; /**< Advertizes that Protected Management Frame is required. Device will not associate to non-PMF capable devices. */
} wifi_pmf_config_t;

2
components/esp_wifi/lib

@ -1 +1 @@
Subproject commit bba5f9116dec8eccce0ad43281a69f3f7f8c633b
Subproject commit 4c9f657748769d61b453b7b5b631c823ef9b4112

1
components/wpa_supplicant/src/esp_supplicant/esp_dpp.c
View File

@ -178,7 +178,6 @@ static int esp_dpp_handle_config_obj(struct dpp_authentication *auth,
os_memcpy(wifi_cfg->sta.password, conf->passphrase,
sizeof(wifi_cfg->sta.password));
if (conf->akm == DPP_AKM_PSK_SAE) {
wifi_cfg->sta.pmf_cfg.capable = true;
wifi_cfg->sta.pmf_cfg.required = true;
}
}

51
docs/en/api-guides/wifi-security.rst
View File

@ -25,31 +25,12 @@ An attacker can use eavesdropping and packet injection to send spoofed (de)authe
PMF provides protection against these attacks by encrypting unicast management frames and providing integrity checks for broadcast management frames. These include deauthentication, disassociation and robust management frames. It also provides Secure Association (SA) teardown mechanism to prevent spoofed association/authentication frames from disconnecting already connected clients.
API & Usage
+++++++++++
There are 3 types of PMF configuration modes on both Station and AP side -
- PMF Optional
- PMF Required
- PMF Disabled
:cpp:func:`esp_wifi_set_config` can be used to configure PMF mode by setting appropriate flags in `pmf_cfg` parameter. Currently, PMF is supported only in Station mode.
While setting up a Station, configure PMF using two flags ``capable`` and ``required`` like below.
.. code-block:: c
wifi_config_t wifi_config = {
.sta = {
.ssid = EXAMPLE_WIFI_SSID,
.password = EXAMPLE_WIFI_PASSWORD,
.pmf_cfg = {
.capable = true,
.required = false
}
}
};
{IDF_TARGET_NAME} supports three modes of PMF by combination of these two flags -
- PMF Optional : ``.capable = true, .required = false``
- PMF Required : ``.capable = true, .required = true``
- PMF Disabled : ``.capable = false, .required = false``
Depending on what AP side PMF Mode is, the resulting connnection will behave differently. The table below summarises all possible outcomes -
Depending on the PMF configuration on Station and AP side, the resulting connection will behave differently. Below table summarises all possible outcomes.
+--------------+------------------------+---------------------------+
| STA Setting | AP Setting | Outcome |
@ -67,7 +48,27 @@ While setting up a Station, configure PMF using two flags ``capable`` and ``requ
| PMF Disabled | PMF Required | AP refuses Connection |
+--------------+------------------------+---------------------------+
PMF Optional Mode, which is shown in the example of ``wifi_confit_t``, is suggested to be used in all Station configurations. This is to take the additional security benefit of PMF whenever possible without breaking connections with legacy AP's.
API & Usage
+++++++++++
{IDF_TARGET_NAME} supports PMF only in Station mode. Station defaults to PMF Optional mode and disabling PMF is not possible. For even higher security, PMF required mode can be enabled by setting the ``required`` flag in `pmf_cfg` while using the :cpp:func:`esp_wifi_set_config` API. This will result in Station only connecting to a PMF enabled AP and rejecting all other AP's. An example of this configuration is given below.
.. code-block:: c
wifi_config_t wifi_config = {
.sta = {
.ssid = EXAMPLE_WIFI_SSID,
.password = EXAMPLE_WIFI_PASSWORD,
.pmf_cfg = {
.required = true
}
}
};
.. attention::
``capable`` flag in `pmf_cfg` is deprecated and set to true internally. This is to take the additional security benefit of PMF whenever possible.
WPA3-Personal
-------------

5
examples/bluetooth/nimble/bleprph_wifi_coex/main/main.c
View File

@ -123,11 +123,6 @@ void wifi_init_sta(void)
* However these modes are deprecated and not advisable to be used. Incase your Access point
* doesn't support WPA2, these mode can be enabled by commenting below line */
.threshold.authmode = WIFI_AUTH_WPA2_PSK,
.pmf_cfg = {
.capable = true,
.required = false
},
},
};
ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_STA) );

17
examples/wifi/ftm/main/ftm_main.c
View File

@ -261,7 +261,10 @@ static bool wifi_perform_scan(const char *ssid, bool internal)
uint8_t i;
ESP_ERROR_CHECK( esp_wifi_set_mode(WIFI_MODE_STA) );
ESP_ERROR_CHECK( esp_wifi_scan_start(&scan_config, true) );
if (ESP_OK != esp_wifi_scan_start(&scan_config, true)) {
ESP_LOGI(TAG_STA, "Failed to perform scan");
return false;
}
esp_wifi_scan_get_ap_num(&g_scan_ap_num);
if (g_scan_ap_num == 0) {
@ -317,7 +320,7 @@ static bool wifi_cmd_ap_set(const char* ssid, const char* pass)
if (pass) {
if (strlen(pass) != 0 && strlen(pass) < 8) {
s_reconnect = true;
ESP_LOGE(TAG_AP, "password less than 8");
ESP_LOGE(TAG_AP, "password cannot be less than 8 characters long");
return false;
}
strlcpy((char*) g_ap_config.ap.password, pass, MAX_PASSPHRASE_LEN);
@ -341,8 +344,11 @@ static int wifi_cmd_ap(int argc, char** argv)
return 1;
}
wifi_cmd_ap_set(ap_args.ssid->sval[0], ap_args.password->sval[0]);
ESP_LOGI(TAG_AP, "Starting SoftAP with FTM Responder support, SSID - %s, Password - %s", ap_args.ssid->sval[0], ap_args.password->sval[0]);
if (true == wifi_cmd_ap_set(ap_args.ssid->sval[0], ap_args.password->sval[0]))
ESP_LOGI(TAG_AP, "Starting SoftAP with FTM Responder support, SSID - %s, Password - %s", ap_args.ssid->sval[0], ap_args.password->sval[0]);
else
ESP_LOGE(TAG_AP, "Failed to start SoftAP!");
return 0;
}
@ -476,7 +482,7 @@ static int wifi_cmd_ftm(int argc, char **argv)
}
bits = xEventGroupWaitBits(ftm_event_group, FTM_REPORT_BIT | FTM_FAILURE_BIT,
pdFALSE, pdFALSE, portMAX_DELAY);
pdTRUE, pdFALSE, portMAX_DELAY);
/* Processing data from FTM session */
if (bits & FTM_REPORT_BIT) {
ftm_process_report();
@ -485,7 +491,6 @@ static int wifi_cmd_ftm(int argc, char **argv)
g_ftm_report_num_entries = 0;
ESP_LOGI(TAG_STA, "Estimated RTT - %d nSec, Estimated Distance - %d.%02d meters",
g_rtt_est, g_dist_est / 100, g_dist_est % 100);
xEventGroupClearBits(ftm_event_group, FTM_REPORT_BIT);
} else {
/* Failure case */
}

5
examples/wifi/getting_started/station/main/station_example_main.c
View File

@ -96,11 +96,6 @@ void wifi_init_sta(void)
* However these modes are deprecated and not advisable to be used. Incase your Access point
* doesn't support WPA2, these mode can be enabled by commenting below line */
.threshold.authmode = WIFI_AUTH_WPA2_PSK,
.pmf_cfg = {
.capable = true,
.required = false
},
},
};
ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_STA) );

1
examples/wifi/iperf/main/cmd_wifi.c
View File

@ -148,7 +148,6 @@ static bool wifi_cmd_sta_join(const char* ssid, const char* pass)
int bits = xEventGroupWaitBits(wifi_event_group, CONNECTED_BIT, 0, 1, 0);
wifi_config_t wifi_config = { 0 };
wifi_config.sta.pmf_cfg.capable = true;
strlcpy((char*) wifi_config.sta.ssid, ssid, sizeof(wifi_config.sta.ssid));
if (pass) {

8
examples/wifi/wifi_eap_fast/main/wifi_eap_fast_main.c
View File

@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: CC0-1.0
*/
@ -89,12 +89,6 @@ static void initialise_wifi(void)
wifi_config_t wifi_config = {
.sta = {
.ssid = EXAMPLE_WIFI_SSID,
#if defined(CONFIG_EXAMPLE_WPA3_ENTERPRISE)
.pmf_cfg = {
.capable = true,
.required = false
},
#endif
},
};
ESP_LOGI(TAG, "Setting WiFi configuration SSID %s...", wifi_config.sta.ssid);