espressif/ESP8266_RTOS_SDK
1
0
Fork 0
mirror of https://github.com/espressif/ESP8266_RTOS_SDK.git synced 2025-10-21 23:52:28 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'bugfix/fix_pmk_error_v3.4' into 'release/v3.4'

Browse Source 
fix(wpa_supplicant): fix pmk error(backport v3.4)

See merge request sdk/ESP8266_RTOS_SDK!1625
This commit is contained in:
Dong Heng
2021-07-26 11:28:54 +00:00
parent 562e650b25 2c9b38b244
commit e600fe09d7
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/wpa_supplicant/src/ap/ap_config.c
View File

@@ -130,14 +130,12 @@ static int hostapd_derive_psk(struct hostapd_ssid *ssid)
wpa_hexdump_ascii_key(MSG_DEBUG, "PSK (ASCII passphrase)", wpa_hexdump_ascii_key(MSG_DEBUG, "PSK (ASCII passphrase)",
(u8 *) ssid->wpa_passphrase, (u8 *) ssid->wpa_passphrase,
strlen(ssid->wpa_passphrase)); strlen(ssid->wpa_passphrase));
#ifdef ESP_SUPPLICANT
memcpy(ssid->wpa_psk->psk, esp_wifi_ap_get_prof_pmk_internal(), PMK_LEN);
#else
/* It's too SLOW */ /* It's too SLOW */
pbkdf2_sha1(ssid->wpa_passphrase, pbkdf2_sha1(ssid->wpa_passphrase,
ssid->ssid, ssid->ssid_len, (const char *)ssid->ssid, ssid->ssid_len,
4096, ssid->wpa_psk->psk, PMK_LEN); 4096, ssid->wpa_psk->psk, PMK_LEN);
#endif
wpa_hexdump_key(MSG_DEBUG, "PSK (from passphrase)", wpa_hexdump_key(MSG_DEBUG, "PSK (from passphrase)",
ssid->wpa_psk->psk, PMK_LEN); ssid->wpa_psk->psk, PMK_LEN);
return 0; return 0;