commit 4536bb6f2bfdb3a552f756607ac815961a7e0c8c
author Kusumit Ghoderao <Kusumit.Ghoderao@silabs.com> Thu Jun 22 15:42:59 2023 +0530
committer Kusumit Ghoderao <Kusumit.Ghoderao@silabs.com> Tue Jul 04 15:17:01 2023 +0530
tree 3b814380e612911c086196f5ae7e622081037932
parent a2520a5b7e9fadb887c915fab5d8d866ee6dc557

Change mac_size parameter in driver_mac_compute to output length

See #7801 for reference

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 c3531e4..1f5ab0d 100644
--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@@ -5575,11 +5575,14 @@
     memcpy(U_accumulator, U_i, prf_output_length);
 
     for (i = 1; i < pbkdf2->input_cost; i++) {
+        /* We are passing prf_output_length as mac_size because the driver
+         * function directly sets mac_output_length as mac_size upon success.
+         * See #7801 */
         status = psa_driver_wrapper_mac_compute(attributes,
                                                 pbkdf2->password,
                                                 pbkdf2->password_length,
                                                 prf_alg, U_i, prf_output_length,
-                                                U_i, sizeof(U_i),
+                                                U_i, prf_output_length,
                                                 &mac_output_length);
         if (status != PSA_SUCCESS) {
             goto cleanup;