commit b9410e89b4380653836da161b6750e1c5bc3f959
author Kusumit Ghoderao <Kusumit.Ghoderao@silabs.com> Wed May 03 18:36:35 2023 +0530
committer Kusumit Ghoderao <Kusumit.Ghoderao@silabs.com> Thu May 04 13:17:51 2023 +0530
tree 7969ee39ecfa4df58b1d0c5e4a97cd7f528f100a
parent 056f0c5047c139309e3bc736805262f672474e6c

Fix failing CI

Signed-off-by: Kusumit Ghoderao <Kusumit.Ghoderao@silabs.com>

include/mbedtls/config_psa.h

diff --git a/include/mbedtls/config_psa.h b/include/mbedtls/config_psa.h
index bbad0c4..bb39131 100644
--- a/include/mbedtls/config_psa.h
+++ b/include/mbedtls/config_psa.h
@@ -264,7 +264,9 @@
 #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 @@
 #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

library/psa_crypto.c

diff --git a/library/psa_crypto.c b/library/psa_crypto.c
index 2a4ac7b..7262d84 100644
--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@@ -6471,7 +6471,7 @@
 
             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);
         }