Bug fix: save the driver's persistent data in destroy_key

gilles-peskine-arm · gilles-peskine-arm · commit 725f22a545c1 · 2019-07-25T11:32:27.000+02:00
diff --git a/library/psa_crypto.c b/library/psa_crypto.c
@@ -1007,7 +1007,11 @@ psa_status_t psa_destroy_key( psa_key_handle_t handle )
 #if defined(MBEDTLS_PSA_CRYPTO_SE_C)
     if( driver != NULL )
     {
-        status = psa_crypto_stop_transaction( );
+        psa_status_t status2;
+        status = psa_save_se_persistent_data( driver );
+        status2 = psa_crypto_stop_transaction( );
+        if( status == PSA_SUCCESS )
+            status = status2;
         if( status != PSA_SUCCESS )
         {
             /* TOnogrepDO: destroy what can be destroyed anyway */

Original file line number	Diff line number	Diff line change
`@@ -1007,7 +1007,11 @@ psa_status_t psa_destroy_key( psa_key_handle_t handle )`
`1007`	`1007`	`#if defined(MBEDTLS_PSA_CRYPTO_SE_C)`
`1008`	`1008`	`if( driver != NULL )`
`1009`	`1009`	`{`
`1010`		`- status = psa_crypto_stop_transaction( );`
	`1010`	`+ psa_status_t status2;`
	`1011`	`+ status = psa_save_se_persistent_data( driver );`
	`1012`	`+ status2 = psa_crypto_stop_transaction( );`
	`1013`	`+ if( status == PSA_SUCCESS )`
	`1014`	`+ status = status2;`
`1011`	`1015`	`if( status != PSA_SUCCESS )`
`1012`	`1016`	`{`
`1013`	`1017`	`/* TOnogrepDO: destroy what can be destroyed anyway */`