commit b538bb7a028e6a340cd2d240868513719013e004
author Kusumit Ghoderao <Kusumit.Ghoderao@silabs.com> Wed May 24 12:32:14 2023 +0530
committer Kusumit Ghoderao <Kusumit.Ghoderao@silabs.com> Wed May 24 12:32:14 2023 +0530
tree ea17f8d267704ee91c4c2b73b267694229c954c3
parent e66a8ad8d6b502a74a3c97dbf41ec76a62574506

Restructure pbkdf2_set_salt function

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 a8ccde5..77c5184 100644
--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@@ -6437,9 +6437,6 @@
                                         const uint8_t *data,
                                         size_t data_length)
 {
-    uint8_t *prev_salt;
-    size_t prev_salt_length;
-
     if (pbkdf2->state != PSA_PBKDF2_STATE_INPUT_COST_SET &&
         pbkdf2->state != PSA_PBKDF2_STATE_SALT_SET) {
         return PSA_ERROR_BAD_STATE;
@@ -6454,16 +6451,16 @@
         memcpy(pbkdf2->salt, data, data_length);
         pbkdf2->salt_length = data_length;
     } else if (pbkdf2->state == PSA_PBKDF2_STATE_SALT_SET) {
-        prev_salt = pbkdf2->salt;
-        prev_salt_length = pbkdf2->salt_length;
+        uint8_t *prev_salt = pbkdf2->salt;
+        size_t prev_salt_length = pbkdf2->salt_length;
+
         pbkdf2->salt = mbedtls_calloc(1, data_length + prev_salt_length);
         if (pbkdf2->salt == NULL) {
             return PSA_ERROR_INSUFFICIENT_MEMORY;
         }
 
         memcpy(pbkdf2->salt, prev_salt, prev_salt_length);
-        memcpy(pbkdf2->salt + prev_salt_length, data,
-               data_length);
+        memcpy(pbkdf2->salt + prev_salt_length, data, data_length);
         pbkdf2->salt_length += data_length;
         mbedtls_free(prev_salt);
     }