commit 0bb653600f89eae09cbbe5c1925a1cb7da9bbf17
author Steven Cooreman <steven.cooreman@silabs.com> Tue Apr 06 15:09:57 2021 +0200
committer Steven Cooreman <steven.cooreman@silabs.com> Thu Apr 15 15:06:53 2021 +0200
tree 162eea4d6388f0c42034d791a3cdd4c0f7f21076
parent 054bf7f2a00bf7d14b4ba7350a1cc9039f23566f

If no storage backend is available, don't even attempt key loading

Signed-off-by: Steven Cooreman <steven.cooreman@silabs.com>

library/psa_crypto_slot_management.c

diff --git a/library/psa_crypto_slot_management.c b/library/psa_crypto_slot_management.c
index 336bc37..de20fa1 100644
--- a/library/psa_crypto_slot_management.c
+++ b/library/psa_crypto_slot_management.c
@@ -351,6 +351,9 @@
     if( status != PSA_ERROR_DOES_NOT_EXIST )
         return( status );
 
+    /* Loading keys from storage requires support for such a mechanism */
+#if defined(MBEDTLS_PSA_CRYPTO_STORAGE_C) || \
+    defined(MBEDTLS_PSA_CRYPTO_BUILTIN_KEYS)
     psa_key_id_t volatile_key_id;
 
     status = psa_get_empty_key_slot( &volatile_key_id, p_slot );
@@ -378,6 +381,9 @@
             status = PSA_ERROR_INVALID_HANDLE;
     }
     return( status );
+#else /* MBEDTLS_PSA_CRYPTO_STORAGE_C || MBEDTLS_PSA_CRYPTO_BUILTIN_KEYS */
+    return( PSA_ERROR_INVALID_HANDLE );
+#endif /* MBEDTLS_PSA_CRYPTO_STORAGE_C || MBEDTLS_PSA_CRYPTO_BUILTIN_KEYS */
 }
 
 psa_status_t psa_unlock_key_slot( psa_key_slot_t *slot )