From b9410e89b4380653836da161b6750e1c5bc3f959 Mon Sep 17 00:00:00 2001 From: Kusumit Ghoderao Date: Wed, 3 May 2023 18:36:35 +0530 Subject: [PATCH] Fix failing CI Signed-off-by: Kusumit Ghoderao --- include/mbedtls/config_psa.h | 14 ++++++++------ library/psa_crypto.c | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/include/mbedtls/config_psa.h b/include/mbedtls/config_psa.h index bbad0c4af1..bb39131972 100644 --- a/include/mbedtls/config_psa.h +++ b/include/mbedtls/config_psa.h @@ -264,7 +264,9 @@ extern "C" { #if defined(PSA_WANT_ALG_PBKDF2_HMAC) #if !defined(MBEDTLS_PSA_ACCEL_ALG_PBKDF2_HMAC) #define MBEDTLS_PSA_BUILTIN_ALG_PBKDF2_HMAC 1 +#if !defined(MBEDTLS_PSA_ACCEL_ALG_HMAC) #define MBEDTLS_PSA_BUILTIN_ALG_HMAC 1 +#endif /* !MBEDTLS_PSA_ACCEL_ALG_HMAC */ #endif /* !MBEDTLS_PSA_BUILTIN_ALG_PBKDF2_HMAC */ #endif /* PSA_WANT_ALG_PBKDF2_HMAC */ @@ -682,12 +684,12 @@ extern "C" { #define PSA_WANT_ALG_HMAC 1 #define PSA_WANT_KEY_TYPE_HMAC -#if defined(MBEDTLS_PKCS5_C) -#define MBEDTLS_PSA_BUILTIN_ALG_HMAC 1 -#define PSA_WANT_ALG_HMAC 1 -#define MBEDTLS_PSA_BUILTIN_ALG_PBKDF2_HMAC 1 -#define PSA_WANT_ALG_PBKDF2_HMAC 1 -#endif /* MBEDTLS_PKCS5_C */ +// #if defined(MBEDTLS_PKCS5_C) +// #define MBEDTLS_PSA_BUILTIN_ALG_HMAC 1 +// #define PSA_WANT_ALG_HMAC 1 +// #define MBEDTLS_PSA_BUILTIN_ALG_PBKDF2_HMAC 1 +// #define PSA_WANT_ALG_PBKDF2_HMAC 1 +// #endif /* MBEDTLS_PKCS5_C */ #if defined(MBEDTLS_MD_C) #define MBEDTLS_PSA_BUILTIN_ALG_TLS12_PRF 1 diff --git a/library/psa_crypto.c b/library/psa_crypto.c index 2a4ac7b2b5..7262d84b45 100644 --- a/library/psa_crypto.c +++ b/library/psa_crypto.c @@ -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_length, data, - data_length); + data_length); pbkdf2->salt_length += data_length; mbedtls_free(prev_salt); }