commit a2520a5b7e9fadb887c915fab5d8d866ee6dc557
author Kusumit Ghoderao <Kusumit.Ghoderao@silabs.com> Thu Jun 22 15:42:19 2023 +0530
committer Kusumit Ghoderao <Kusumit.Ghoderao@silabs.com> Tue Jul 04 15:17:00 2023 +0530
tree 0c84eb2bf6a860a1108fc8e2aa8b7cfe3f80b2e0
parent 3d5edb8eeffbf3a7c0d7485acbd73312e4645113

Add pbkdf2 cmac to key derivation output_bytes

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

library/psa_crypto.c

diff --git a/library/psa_crypto.c b/library/psa_crypto.c
index 8606f17..c3531e4 100644
--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@@ -5611,8 +5611,10 @@
         prf_alg = PSA_ALG_HMAC(PSA_ALG_PBKDF2_HMAC_GET_HASH(kdf_alg));
         prf_output_length = PSA_HASH_LENGTH(prf_alg);
         psa_set_key_type(&attributes, PSA_KEY_TYPE_HMAC);
-    } else {
-        return PSA_ERROR_INVALID_ARGUMENT;
+    } else if (kdf_alg == PSA_ALG_PBKDF2_AES_CMAC_PRF_128) {
+        prf_alg = PSA_ALG_CMAC;
+        prf_output_length = AES_CMAC_PRF_128_OUTPUT_SIZE;
+        psa_set_key_type(&attributes, PSA_KEY_TYPE_AES);
     }
 
     switch (pbkdf2->state) {