commit a53e7a5cb56e8cdc50fb02f31fabf9701792b526
author Valerio Setti <valerio.setti@nordicsemi.no> Mon Feb 26 12:03:59 2024 +0100
committer Valerio Setti <valerio.setti@nordicsemi.no> Mon Feb 26 12:03:59 2024 +0100
tree 11f1a8f1e27fbb1aec950dd557b2aa1df6d6318b
parent bb91bcda0e60f6c106323598e9477b60c6a96507

psa: let mbedtls_psa_get_random() always use psa_generate_random()

It means that mbedtls_psa_get_random() goes through the PSA interface
all the times. Fallbacks to CTR_DRBG or HMAC_DRBG are still possible,
but that depends on how the crypto provider is built.

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

library/psa_crypto.c

diff --git a/library/psa_crypto.c b/library/psa_crypto.c
index 3aed6e6..c371339 100644
--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@@ -102,7 +102,7 @@
 static psa_global_data_t global_data;
 
 #if !defined(MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG)
-mbedtls_psa_drbg_context_t *const mbedtls_psa_random_state =
+mbedtls_psa_drbg_context_t *const mbedtls_psa_drbg_ctx =
     &global_data.rng.drbg;
 #endif
 
@@ -7322,7 +7322,7 @@
                                MBEDTLS_ENTROPY_SOURCE_STRONG);
 #endif
 
-    mbedtls_psa_drbg_init(MBEDTLS_PSA_RANDOM_STATE);
+    mbedtls_psa_drbg_init(MBEDTLS_PSA_DRBG_CTX);
 #endif /* MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG */
 }
 
@@ -7333,7 +7333,7 @@
 #if defined(MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG)
     memset(rng, 0, sizeof(*rng));
 #else /* MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG */
-    mbedtls_psa_drbg_free(MBEDTLS_PSA_RANDOM_STATE);
+    mbedtls_psa_drbg_free(MBEDTLS_PSA_DRBG_CTX);
     rng->entropy_free(&rng->entropy);
 #endif /* MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG */
 }
@@ -7382,8 +7382,8 @@
             (output_size > MBEDTLS_PSA_RANDOM_MAX_REQUEST ?
              MBEDTLS_PSA_RANDOM_MAX_REQUEST :
              output_size);
-        int ret = mbedtls_psa_get_random(MBEDTLS_PSA_RANDOM_STATE,
-                                         output, request_size);
+        int ret = mbedtls_psa_legacy_get_random(MBEDTLS_PSA_DRBG_CTX,
+                                                output, request_size);
         if (ret != 0) {
             return mbedtls_to_psa_error(ret);
         }