Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-08-18 06:35:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/pbkdf2_sha256_mbedtls4_guard_v6.1' into 'release/v6.1'

Browse Source 
fix(wpa_supplicant): guard pbkdf2_sha256 for PSA-provided SHA-256 (v6.1)

See merge request espressif/esp-idf!50460
This commit is contained in:
Jiang Jiang Jian
2026-07-16 18:57:43 +08:00
parent 4fe6db39ca faaaea8e67
commit 14f663f003
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/wpa_supplicant/esp_supplicant/src/crypto/crypto_mbedtls.c
View File

@@ -1111,7 +1111,7 @@ int pbkdf2_sha1(const char *passphrase, const u8 *ssid, size_t ssid_len,
#if defined(MBEDTLS_PKCS5_C) && defined(MBEDTLS_MD_C)
#include "mbedtls/private/pkcs5.h"
#if defined(MBEDTLS_SHA256_C)
#if (defined(MBEDTLS_SHA256_C) || defined(PSA_WANT_ALG_SHA_256))
int pbkdf2_sha256(const char *passphrase, const u8 *salt, size_t salt_len,
int iterations, u8 *buf, size_t buflen)
{
@@ -1128,7 +1128,7 @@ int pbkdf2_sha256(const char *passphrase, const u8 *salt, size_t salt_len,
(unsigned int) iterations, (uint32_t) buflen, buf);
return ret == 0 ? 0 : -1;
}
#endif /* MBEDTLS_SHA256_C */
#endif /* MBEDTLS_SHA256_C || PSA_WANT_ALG_SHA_256 */
#endif /* MBEDTLS_PKCS5_C && MBEDTLS_MD_C */