mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-03-01 13:13:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix failing CI

Browse Source 
Signed-off-by: Kusumit Ghoderao <Kusumit.Ghoderao@silabs.com>
This commit is contained in:
Kusumit Ghoderao 2023-05-03 18:36:35 +05:30
parent 056f0c5047
commit b9410e89b4
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/mbedtls/config_psa.h
View File

@ -264,7 +264,9 @@ extern "C" {
#if defined(PSA_WANT_ALG_PBKDF2_HMAC) #if defined(PSA_WANT_ALG_PBKDF2_HMAC)
#if !defined(MBEDTLS_PSA_ACCEL_ALG_PBKDF2_HMAC) #if !defined(MBEDTLS_PSA_ACCEL_ALG_PBKDF2_HMAC)
#define MBEDTLS_PSA_BUILTIN_ALG_PBKDF2_HMAC 1 #define MBEDTLS_PSA_BUILTIN_ALG_PBKDF2_HMAC 1
#if !defined(MBEDTLS_PSA_ACCEL_ALG_HMAC)
#define MBEDTLS_PSA_BUILTIN_ALG_HMAC 1 #define MBEDTLS_PSA_BUILTIN_ALG_HMAC 1
#endif /* !MBEDTLS_PSA_ACCEL_ALG_HMAC */
#endif /* !MBEDTLS_PSA_BUILTIN_ALG_PBKDF2_HMAC */ #endif /* !MBEDTLS_PSA_BUILTIN_ALG_PBKDF2_HMAC */
#endif /* PSA_WANT_ALG_PBKDF2_HMAC */ #endif /* PSA_WANT_ALG_PBKDF2_HMAC */
@ -682,12 +684,12 @@ extern "C" {
#define PSA_WANT_ALG_HMAC 1 #define PSA_WANT_ALG_HMAC 1
#define PSA_WANT_KEY_TYPE_HMAC #define PSA_WANT_KEY_TYPE_HMAC
#if defined(MBEDTLS_PKCS5_C) // #if defined(MBEDTLS_PKCS5_C)
#define MBEDTLS_PSA_BUILTIN_ALG_HMAC 1 // #define MBEDTLS_PSA_BUILTIN_ALG_HMAC 1
#define PSA_WANT_ALG_HMAC 1 // #define PSA_WANT_ALG_HMAC 1
#define MBEDTLS_PSA_BUILTIN_ALG_PBKDF2_HMAC 1 // #define MBEDTLS_PSA_BUILTIN_ALG_PBKDF2_HMAC 1
#define PSA_WANT_ALG_PBKDF2_HMAC 1 // #define PSA_WANT_ALG_PBKDF2_HMAC 1
#endif /* MBEDTLS_PKCS5_C */ // #endif /* MBEDTLS_PKCS5_C */
#if defined(MBEDTLS_MD_C) #if defined(MBEDTLS_MD_C)
#define MBEDTLS_PSA_BUILTIN_ALG_TLS12_PRF 1 #define MBEDTLS_PSA_BUILTIN_ALG_TLS12_PRF 1

2
library/psa_crypto.c
View File

@ -6471,7 +6471,7 @@ static psa_status_t psa_pbkdf2_set_salt(psa_pbkdf2_key_derivation_t *pbkdf2,
memcpy(pbkdf2->salt, prev_salt, prev_salt_length); memcpy(pbkdf2->salt, prev_salt, prev_salt_length);
memcpy(pbkdf2->salt + prev_salt_length, data, memcpy(pbkdf2->salt + prev_salt_length, data,
data_length); data_length);
pbkdf2->salt_length += data_length; pbkdf2->salt_length += data_length;
mbedtls_free(prev_salt); mbedtls_free(prev_salt);
} }