commit ee5920a7d5c3b26dfcf492254fe1323d3da2badf
author Ryan Everett <ryan.everett@arm.com> Fri Feb 09 15:09:28 2024 +0000
committer GitHub <noreply@github.com> Fri Feb 09 15:09:28 2024 +0000
tree 3dd4b3925a524f9a60993f2195539f7da99ffff0
parent eb8c665a5337443dd516e0b8ab67e93c8ea3919b

Fix error path in `psa_key_derivation_output_bytes`

Co-authored-by: David Horstmann <david.horstmann@arm.com>
Signed-off-by: Ryan Everett <ryan.everett@arm.com>

library/psa_crypto.c

diff --git a/library/psa_crypto.c b/library/psa_crypto.c
index 5ad9f23..00eef4c 100644
--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@@ -5881,7 +5881,9 @@
         psa_algorithm_t alg = operation->alg;
         psa_key_derivation_abort(operation);
         operation->alg = alg;
-        memset(output, '!', output_length);
+        if (output != NULL) {
+            memset(output, '!', output_length);
+        }
     }
 
     LOCAL_OUTPUT_FREE(output_external, output);