commit 9ab03c3d727e2026d45f0b2a4ea19501f910402e
author Kusumit Ghoderao <Kusumit.Ghoderao@silabs.com> Thu Jul 27 21:14:05 2023 +0530
committer Kusumit Ghoderao <Kusumit.Ghoderao@silabs.com> Thu Jul 27 21:14:05 2023 +0530
tree b304a069ddeee498f59882f5e86457f63af185d7
parent 2addf35855a40c3ee9ec6499957d9f6695bef577

Define PSA_ALG_IS_PBKDF2

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

include/psa/crypto_values.h

diff --git a/include/psa/crypto_values.h b/include/psa/crypto_values.h
index 580e3ae..50df3e3 100644
--- a/include/psa/crypto_values.h
+++ b/include/psa/crypto_values.h
@@ -2115,6 +2115,10 @@
  */
 #define PSA_ALG_PBKDF2_AES_CMAC_PRF_128         ((psa_algorithm_t) 0x08800200)
 
+#define PSA_ALG_IS_PBKDF2(kdf_alg)                                      \
+    (PSA_ALG_IS_PBKDF2_HMAC(kdf_alg) || \
+     (kdf_alg == PSA_ALG_PBKDF2_AES_CMAC_PRF_128))
+
 #define PSA_ALG_KEY_DERIVATION_MASK             ((psa_algorithm_t) 0xfe00ffff)
 #define PSA_ALG_KEY_AGREEMENT_MASK              ((psa_algorithm_t) 0xffff0000)
 

library/psa_crypto.c

diff --git a/library/psa_crypto.c b/library/psa_crypto.c
index c3c4d58..2e3d451 100644
--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@@ -5185,6 +5185,7 @@
     } else
 #endif /* defined(MBEDTLS_PSA_BUILTIN_ALG_TLS12_ECJPAKE_TO_PMS) */
 #if defined(PSA_HAVE_SOFT_PBKDF2)
+    if (PSA_ALG_IS_PBKDF2(kdf_alg)) {
         if (operation->ctx.pbkdf2.salt != NULL) {
             mbedtls_platform_zeroize(operation->ctx.pbkdf2.salt,
                                      operation->ctx.pbkdf2.salt_length);
@@ -5712,6 +5713,7 @@
     } else
 #endif /* MBEDTLS_PSA_BUILTIN_ALG_TLS12_ECJPAKE_TO_PMS */
 #if defined(PSA_HAVE_SOFT_PBKDF2)
+    if (PSA_ALG_IS_PBKDF2(kdf_alg)) {
         status = psa_key_derivation_pbkdf2_read(&operation->ctx.pbkdf2, kdf_alg,
                                                 output, output_length);
     } else
@@ -6888,6 +6890,7 @@
     } else
 #endif /* MBEDTLS_PSA_BUILTIN_ALG_TLS12_ECJPAKE_TO_PMS */
 #if defined(PSA_HAVE_SOFT_PBKDF2)
+    if (PSA_ALG_IS_PBKDF2(kdf_alg)) {
         status = psa_pbkdf2_input(&operation->ctx.pbkdf2, kdf_alg,
                                   step, data, data_length);
     } else
@@ -6916,6 +6919,7 @@
     psa_algorithm_t kdf_alg = psa_key_derivation_get_kdf_alg(operation);
 
 #if defined(PSA_HAVE_SOFT_PBKDF2)
+    if (PSA_ALG_IS_PBKDF2(kdf_alg)) {
         status = psa_pbkdf2_set_input_cost(
             &operation->ctx.pbkdf2, step, value);
     } else