commit ca57d78a6e0ae3e51e0740ed5ef9530d160f8aab
author Gilles Peskine <Gilles.Peskine@arm.com> Thu Jul 20 19:08:06 2023 +0200
committer Gilles Peskine <Gilles.Peskine@arm.com> Fri Jul 21 17:50:49 2023 +0200
tree 8a49155c6f330cde0e8220117cccbe534c724bdf
parent 3c861642c85b9a705a25b7fe32194ab12878cb55

Fix PBKDF2 with empty salt on platforms where malloc(0)=NULL

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

library/psa_crypto.c

diff --git a/library/psa_crypto.c b/library/psa_crypto.c
index 8c4d860..c670940 100644
--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@@ -6679,7 +6679,9 @@
         return PSA_ERROR_BAD_STATE;
     }
 
-    if (pbkdf2->state == PSA_PBKDF2_STATE_INPUT_COST_SET) {
+    if (data_length == 0) {
+        /* Nothing to do */
+    } else if (pbkdf2->state == PSA_PBKDF2_STATE_INPUT_COST_SET) {
         pbkdf2->salt = mbedtls_calloc(1, data_length);
         if (pbkdf2->salt == NULL) {
             return PSA_ERROR_INSUFFICIENT_MEMORY;