lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-07-30 22:43:08 +03:00
Code Activity

Merge pull request #198 from gilles-peskine-arm/psa-api-1.0-beta-merge_development_20190801

Browse Source 
Merge mbed-crypto/development into psa-api-1.0-beta
This commit is contained in:
Gilles Peskine
2019-08-08 10:24:53 +02:00
committed by GitHub
parent 82a571167e 5386f6ba07
commit 0c77b0e2f9
185 changed files with 1241 additions and 937 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
library/psa_crypto.c
View File

@ -5922,6 +5922,15 @@ psa_status_t psa_crypto_init( void )
/* Initialize the random generator. */
global_data.entropy_init( &global_data.entropy );
#if defined(MBEDTLS_PSA_INJECT_ENTROPY) && \
defined(MBEDTLS_NO_DEFAULT_ENTROPY_SOURCES)
/* The PSA entropy injection feature depends on using NV seed as an entropy
* source. Add NV seed as an entropy source for PSA entropy injection. */
mbedtls_entropy_add_source( &global_data.entropy,
mbedtls_nv_seed_poll, NULL,
MBEDTLS_ENTROPY_BLOCK_SIZE,
MBEDTLS_ENTROPY_SOURCE_STRONG );
#endif
mbedtls_ctr_drbg_init( &global_data.ctr_drbg );
global_data.rng_state = RNG_INITIALIZED;
status = mbedtls_to_psa_error(