Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-09-22 13:01:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/nan_avail_time_bitmap' into 'master'

Browse Source 
fix(nan): fix Wi-Fi Aware NDP handshake interop with iOS 17 series

See merge request espressif/esp-idf!51544
This commit is contained in:
Jiang Jiang Jian
2026-08-10 12:29:48 +08:00
parent 57ccd12f17 42651e1ee1
commit a1ca70eb43
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/esp_wifi/lib

Submodule components/esp_wifi/lib updated: 1bb5442031...54e2104148

6
components/wpa_supplicant/esp_supplicant/src/esp_nan_supplicant.c
View File

@@ -761,11 +761,7 @@ int nan_pasn_followup_decrypt_keys(const uint8_t *shared_key_attr,
key_desc = (const struct wpa_eapol_key *)(body + 1);
key_info = WPA_GET_BE16(key_desc->key_info);
if (!(key_info & WPA_KEY_INFO_KEY_TYPE)) {
wpa_printf(MSG_INFO,
"NAN: Follow-up frame does not contain pairwise key");
return -1;
}
/* iPhone/hostap set Key Type=0 (NIK is not a pairwise key); don't require the bit. */
if (!(key_info & WPA_KEY_INFO_ENCR_KEY_DATA)) {
wpa_printf(MSG_INFO,
"NAN: Follow-up frame does not contain encrypted key data");