Skip to content

Commit d11de77

Browse files
committed
Merge branch 'bugfix/fix_pmk_error' into 'master'
fix(wpa_supplicant): fix pmk error See merge request sdk/ESP8266_RTOS_SDK!1624
2 parents 1c5882b + 2c455c9 commit d11de77

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

Diff for: components/wpa_supplicant/src/ap/ap_config.c

+3-5
Original file line numberDiff line numberDiff line change
@@ -130,14 +130,12 @@ static int hostapd_derive_psk(struct hostapd_ssid *ssid)
130130
wpa_hexdump_ascii_key(MSG_DEBUG, "PSK (ASCII passphrase)",
131131
(u8 *) ssid->wpa_passphrase,
132132
strlen(ssid->wpa_passphrase));
133-
#ifdef ESP_SUPPLICANT
134-
memcpy(ssid->wpa_psk->psk, esp_wifi_ap_get_prof_pmk_internal(), PMK_LEN);
135-
#else
133+
136134
/* It's too SLOW */
137135
pbkdf2_sha1(ssid->wpa_passphrase,
138-
ssid->ssid, ssid->ssid_len,
136+
(const char *)ssid->ssid, ssid->ssid_len,
139137
4096, ssid->wpa_psk->psk, PMK_LEN);
140-
#endif
138+
141139
wpa_hexdump_key(MSG_DEBUG, "PSK (from passphrase)",
142140
ssid->wpa_psk->psk, PMK_LEN);
143141
return 0;

0 commit comments

Comments
 (0)