commit 4aea1036c64ed9b57c30e80f84d9f8301d66435c
author Gilles Peskine <Gilles.Peskine@arm.com> Thu Jul 25 17:38:34 2019 +0200
committer Gilles Peskine <Gilles.Peskine@arm.com> Thu Jul 25 17:38:34 2019 +0200
tree ee5b18320030d4aef4e3cb0648f7e8a84504b72c
parent 340b127ed1a697dd97ce9974a3f314820c62af97

Bug fix: don't start a transaction for non-SE keys

library/psa_crypto.c

diff --git a/library/psa_crypto.c b/library/psa_crypto.c
index 4bd2d13..50be997 100644
--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@@ -1478,14 +1478,14 @@
                                            &slot->data.se.slot_number );
         if( status != PSA_SUCCESS )
             return( status );
+        psa_crypto_prepare_transaction( PSA_CRYPTO_TRANSACTION_CREATE_KEY );
+        psa_crypto_transaction.key.lifetime = slot->lifetime;
+        psa_crypto_transaction.key.slot = slot->data.se.slot_number;
+        psa_crypto_transaction.key.id = slot->persistent_storage_id;
+        status = psa_crypto_save_transaction( );
+        if( status != PSA_SUCCESS )
+            return( status );
     }
-    psa_crypto_prepare_transaction( PSA_CRYPTO_TRANSACTION_CREATE_KEY );
-    psa_crypto_transaction.key.lifetime = slot->lifetime;
-    psa_crypto_transaction.key.slot = slot->data.se.slot_number;
-    psa_crypto_transaction.key.id = slot->persistent_storage_id;
-    status = psa_crypto_save_transaction( );
-    if( status != PSA_SUCCESS )
-        return( status );
 #endif /* MBEDTLS_PSA_CRYPTO_SE_C */
 
     return( status );