commit 0adf0fc31c2ed664f7536e15c8c7ef4e99e1b5a5
author itayzafrir <itay.zafrir@arm.com> Thu Sep 06 16:24:41 2018 +0300
committer itayzafrir <itay.zafrir@arm.com> Sun Sep 16 12:15:46 2018 +0300
tree bc01809ac28d15fee140678389f8e5d27ce8528e
parent e852df846649dbf0a8ece71c2d77dfa5f5907c8d

Ensure the module is initialized in psa_generate_random

library/psa_crypto.c

diff --git a/library/psa_crypto.c b/library/psa_crypto.c
index dfbb680..01dbf3c 100644
--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@@ -148,6 +148,10 @@
 
 static psa_global_data_t global_data;
 
+#define GUARD_MODULE_INITIALIZED        \
+    if( global_data.initialized == 0 )  \
+        return( PSA_ERROR_BAD_STATE );
+
 static psa_status_t mbedtls_to_psa_error( int ret )
 {
     /* If there's both a high-level code and low-level code, dispatch on
@@ -3360,8 +3364,10 @@
 psa_status_t psa_generate_random( uint8_t *output,
                                   size_t output_size )
 {
-    int ret = mbedtls_ctr_drbg_random( &global_data.ctr_drbg,
-                                       output, output_size );
+    int ret;
+    GUARD_MODULE_INITIALIZED;
+
+    ret = mbedtls_ctr_drbg_random( &global_data.ctr_drbg, output, output_size );
     return( mbedtls_to_psa_error( ret ) );
 }