From 4b734223180a81751cbd189f430803464db37cd9 Mon Sep 17 00:00:00 2001
From: Gilles Peskine <Gilles.Peskine@arm.com>
Date: Wed, 24 Jul 2019 15:56:31 +0200
Subject: [PATCH] Transaction support: be more future-proof

If there's ever a non-SE-related transaction, make sure it gets
handled during init.
---
 library/psa_crypto.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/psa_crypto.c b/library/psa_crypto.c
index e508f8f09..f175fc2d0 100644
--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@@ -5800,7 +5800,7 @@ psa_status_t psa_crypto_init( void )
     if( status != PSA_SUCCESS )
         goto exit;
 
-#if defined(MBEDTLS_PSA_CRYPTO_SE_C)
+#if defined(PSA_CRYPTO_STORAGE_HAS_TRANSACTIONS)
     status = psa_crypto_load_transaction( );
     if( status == PSA_SUCCESS )
     {
@@ -5811,7 +5811,7 @@ psa_status_t psa_crypto_init( void )
         /* There's no transaction to complete. It's all good. */
         status = PSA_SUCCESS;
     }
-#endif /* MBEDTLS_PSA_CRYPTO_SE_C */
+#endif /* PSA_CRYPTO_STORAGE_HAS_TRANSACTIONS */
 
     /* All done. */
     global_data.initialized = 1;