commit 83e0de84815b3fc3e6012719b52e24548545ac3a
author Valerio Setti <valerio.setti@nordicsemi.no> Fri Nov 24 12:13:05 2023 +0100
committer Valerio Setti <valerio.setti@nordicsemi.no> Mon Dec 04 11:04:42 2023 +0100
tree 34a14c7b36691a7a4da5a08f0a729686d47b31a6
parent 0ca1868fcdc582ba0c89adc747d855af089342e4

crypto_extra: revert changes to mbedtls_psa_random_free()

Signed-off-by: Valerio Setti <valerio.setti@nordicsemi.no>

include/psa/crypto_extra.h

diff --git a/include/psa/crypto_extra.h b/include/psa/crypto_extra.h
index 8005dcb..ef29b77 100644
--- a/include/psa/crypto_extra.h
+++ b/include/psa/crypto_extra.h
@@ -194,15 +194,6 @@
 /**@}*/
 
 /**
- * \brief PSA random deinitialization.
- *
- * This function frees the RNG implementation used by PSA.
- *
- * This is an Mbed TLS extension.
- */
-void mbedtls_psa_random_free(void);
-
-/**
  * \brief Library deinitialization.
  *
  * This function clears all data associated with the PSA layer,

library/psa_crypto.c

diff --git a/library/psa_crypto.c b/library/psa_crypto.c
index 6caab03..c90119f 100644
--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@@ -7327,16 +7327,14 @@
 
 /** Deinitialize the PSA random generator.
  */
-void mbedtls_psa_random_free(void)
+static void mbedtls_psa_random_free(mbedtls_psa_random_context_t *rng)
 {
-    if (global_data.rng_state != RNG_NOT_INITIALIZED) {
 #if defined(MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG)
-        memset(&global_data.rng, 0, sizeof(global_data.rng));
+    memset(rng, 0, sizeof(*rng));
 #else /* MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG */
-        mbedtls_psa_drbg_free(MBEDTLS_PSA_RANDOM_STATE);
-        global_data.rng.entropy_free(&global_data.rng.entropy);
+    mbedtls_psa_drbg_free(MBEDTLS_PSA_RANDOM_STATE);
+    rng->entropy_free(&rng->entropy);
 #endif /* MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG */
-    }
 }
 
 /** Seed the PSA random generator.
@@ -7663,7 +7661,9 @@
 void mbedtls_psa_crypto_free(void)
 {
     psa_wipe_all_key_slots();
-    mbedtls_psa_random_free();
+    if (global_data.rng_state != RNG_NOT_INITIALIZED) {
+        mbedtls_psa_random_free(&global_data.rng);
+    }
     /* Wipe all remaining data, including configuration.
      * In particular, this sets all state indicator to the value
      * indicating "uninitialized". */

tests/suites/test_suite_psa_crypto_slot_management.function

diff --git a/tests/suites/test_suite_psa_crypto_slot_management.function b/tests/suites/test_suite_psa_crypto_slot_management.function
index cc530e2..8564d35 100644
--- a/tests/suites/test_suite_psa_crypto_slot_management.function
+++ b/tests/suites/test_suite_psa_crypto_slot_management.function
@@ -91,9 +91,7 @@
     }
 
     PSA_ASSERT(psa_crypto_init());
-
     ASSERT_PSA_PRISTINE();
-
     return 1;
 
 exit: