feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'bugfix/mbo_ie_absent_prob_req_v44' into 'release/v4.4'

Browse Source 
wpa_supplicant : Add MBO ie in probe request.(backport v4.4)

See merge request espressif/esp-idf!24099
This commit is contained in:
Jiang Jiang Jian
2023-06-09 19:16:46 +08:00
parent bc05c74022 62b672158a
commit c125f0a9f3
3 changed files with 28 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/wpa_supplicant/esp_supplicant/src/esp_wpa_main.c
View File

@@ -185,7 +185,7 @@ int wpa_sta_connect(uint8_t *bssid)
void wpa_config_done(void) void wpa_config_done(void)
{ {
/* used in future for setting scan and assoc IEs */ esp_set_scan_ie();
} }
int wpa_parse_wpa_ie_wrapper(const u8 *wpa_ie, size_t wpa_ie_len, wifi_wpa_ie_t *data) int wpa_parse_wpa_ie_wrapper(const u8 *wpa_ie, size_t wpa_ie_len, wifi_wpa_ie_t *data)

6
components/wpa_supplicant/src/rsn_supp/wpa.c
View File

@@ -109,6 +109,12 @@ wifi_cipher_type_t cipher_type_map_supp_to_public(unsigned wpa_cipher)
case WPA_CIPHER_SMS4: case WPA_CIPHER_SMS4:
return WIFI_CIPHER_TYPE_SMS4; return WIFI_CIPHER_TYPE_SMS4;
case WPA_CIPHER_GCMP:
return WIFI_CIPHER_TYPE_GCMP;
case WPA_CIPHER_GCMP_256:
return WIFI_CIPHER_TYPE_GCMP256;
default: default:
return WIFI_CIPHER_TYPE_UNKNOWN; return WIFI_CIPHER_TYPE_UNKNOWN;
} }

21
examples/wifi/scan/main/scan.c
View File

@@ -76,6 +76,18 @@ static void print_cipher_type(int pairwise_cipher, int group_cipher)
case WIFI_CIPHER_TYPE_TKIP_CCMP: case WIFI_CIPHER_TYPE_TKIP_CCMP:
ESP_LOGI(TAG, "Pairwise Cipher \tWIFI_CIPHER_TYPE_TKIP_CCMP"); ESP_LOGI(TAG, "Pairwise Cipher \tWIFI_CIPHER_TYPE_TKIP_CCMP");
break; break;
case WIFI_CIPHER_TYPE_AES_CMAC128:
ESP_LOGI(TAG, "Pairwise Cipher \tWIFI_CIPHER_TYPE_AES_CMAC128");
break;
case WIFI_CIPHER_TYPE_SMS4:
ESP_LOGI(TAG, "Pairwise Cipher \tWIFI_CIPHER_TYPE_SMS4");
break;
case WIFI_CIPHER_TYPE_GCMP:
ESP_LOGI(TAG, "Pairwise Cipher \tWIFI_CIPHER_TYPE_GCMP");
break;
case WIFI_CIPHER_TYPE_GCMP256:
ESP_LOGI(TAG, "Pairwise Cipher \tWIFI_CIPHER_TYPE_GCMP256");
break;
default: default:
ESP_LOGI(TAG, "Pairwise Cipher \tWIFI_CIPHER_TYPE_UNKNOWN"); ESP_LOGI(TAG, "Pairwise Cipher \tWIFI_CIPHER_TYPE_UNKNOWN");
break; break;
@@ -100,6 +112,15 @@ static void print_cipher_type(int pairwise_cipher, int group_cipher)
case WIFI_CIPHER_TYPE_TKIP_CCMP: case WIFI_CIPHER_TYPE_TKIP_CCMP:
ESP_LOGI(TAG, "Group Cipher \tWIFI_CIPHER_TYPE_TKIP_CCMP"); ESP_LOGI(TAG, "Group Cipher \tWIFI_CIPHER_TYPE_TKIP_CCMP");
break; break;
case WIFI_CIPHER_TYPE_SMS4:
ESP_LOGI(TAG, "Group Cipher \tWIFI_CIPHER_TYPE_SMS4");
break;
case WIFI_CIPHER_TYPE_GCMP:
ESP_LOGI(TAG, "Group Cipher \tWIFI_CIPHER_TYPE_GCMP");
break;
case WIFI_CIPHER_TYPE_GCMP256:
ESP_LOGI(TAG, "Group Cipher \tWIFI_CIPHER_TYPE_GCMP256");
break;
default: default:
ESP_LOGI(TAG, "Group Cipher \tWIFI_CIPHER_TYPE_UNKNOWN"); ESP_LOGI(TAG, "Group Cipher \tWIFI_CIPHER_TYPE_UNKNOWN");
break; break;