commit c8c89eda5dd1a89267cd2ded7ff6219db5b8dc43
author Waleed Elmelegy <waleed.elmelegy@arm.com> Mon Mar 03 12:35:28 2025 +0000
committer Waleed Elmelegy <waleed.elmelegy@arm.com> Mon Mar 03 13:04:12 2025 +0000
tree 5ac1a29a69f97faab31ca3f078fbea7d7094d85b
parent 89e9fa0978e5aa1ecca8178c2bd47c67a0772d78

Fix psa_key_derivation_input_integer() not detecting bad state

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

library/psa_crypto.c

diff --git a/library/psa_crypto.c b/library/psa_crypto.c
index ec5934e..69d037b 100644
--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@@ -4751,6 +4751,12 @@
     psa_status_t status;
     psa_algorithm_t kdf_alg = psa_key_derivation_get_kdf_alg(operation);
 
+    if (kdf_alg == 0) {
+       /* This is a blank or aborted operation. */
+        status = PSA_ERROR_BAD_STATE;
+        goto exit;
+    }
+
     status = psa_key_derivation_check_input_type(step, key_type);
     if (status != PSA_SUCCESS) {
         goto exit;