commit 280e22518ed1154a56d9b10bed76411c6c31b88b
author Waleed Elmelegy <waleed.elmelegy@arm.com> Wed Oct 30 16:45:41 2024 +0000
committer Waleed Elmelegy <waleed.elmelegy@arm.com> Wed Nov 06 16:03:49 2024 +0000
tree 6b8ea1b556af4e5d400493cacf7528c1326cf542
parent cd721b9870e5d57a84766b94741837a3b1fc141f

Add small fixes to iop key agreement APIs

Signed-off-by: Waleed Elmelegy <waleed.elmelegy@arm.com>

tf-psa-crypto/core/psa_crypto.c

diff --git a/tf-psa-crypto/core/psa_crypto.c b/tf-psa-crypto/core/psa_crypto.c
index 285880a..81c33cc 100644
--- a/tf-psa-crypto/core/psa_crypto.c
+++ b/tf-psa-crypto/core/psa_crypto.c
@@ -7862,6 +7862,9 @@
         psa_key_agreement_iop_abort_internal(operation);
         return status;
     }
+    if (unlock_status != PSA_SUCCESS) {
+        operation->error_occurred = 1;
+    }
     return unlock_status;
 #else
     (void) operation;
@@ -7904,7 +7907,7 @@
         operation->error_occurred = 1;
         psa_key_agreement_iop_abort_internal(operation);
     }
-    mbedtls_platform_zeroize(intermediate_key, PSA_RAW_KEY_AGREEMENT_OUTPUT_MAX_SIZE);
+    mbedtls_platform_zeroize(intermediate_key, sizeof(intermediate_key));
     return status;
 #else
     (void) operation;
@@ -7924,7 +7927,6 @@
 
     operation->num_ops = 0;
     operation->error_occurred = 0;
-    operation->id = 0;
 
     return status;
 #else