Mbed-TLS/mbedtls-framework
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls-framework.git synced 2026-10-12 19:57:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #208 from ronald-cron-arm/entropy-rng-clean-up

Browse Source 
Cleanup following the simplification of entropy and RNG options
This commit is contained in:
Gilles Peskine
2025-09-11 14:09:02 +02:00
committed by GitHub
parent bac469cacb bb7434e767
commit 460af03e64
3 changed files with 7 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/all-helpers.sh
+2
View File
@@ -139,6 +139,8 @@ helper_psasim_config() {
scripts/config.py full scripts/config.py full
scripts/config.py unset MBEDTLS_PSA_CRYPTO_C scripts/config.py unset MBEDTLS_PSA_CRYPTO_C
scripts/config.py unset MBEDTLS_PSA_CRYPTO_STORAGE_C scripts/config.py unset MBEDTLS_PSA_CRYPTO_STORAGE_C
scripts/config.py unset MBEDTLS_ENTROPY_NV_SEED
scripts/config.py unset MBEDTLS_PLATFORM_NV_SEED_ALT
if in_mbedtls_repo && in_3_6_branch; then if in_mbedtls_repo && in_3_6_branch; then
# Dynamic secure element support is a deprecated feature and it is not # Dynamic secure element support is a deprecated feature and it is not
# available when CRYPTO_C and PSA_CRYPTO_STORAGE_C are disabled. # available when CRYPTO_C and PSA_CRYPTO_STORAGE_C are disabled.
tests/include/test/fake_external_rng_for_test.h
+2 -2
View File
@@ -37,7 +37,7 @@ void mbedtls_test_enable_insecure_external_rng(void);
void mbedtls_test_disable_insecure_external_rng(void); void mbedtls_test_disable_insecure_external_rng(void);
#endif /* MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG */ #endif /* MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG */
#if defined(MBEDTLS_PLATFORM_GET_ENTROPY_ALT) || defined(MBEDTLS_PSA_DRIVER_GET_ENTROPY) #if defined(MBEDTLS_PSA_DRIVER_GET_ENTROPY)
#include <mbedtls/platform.h> #include <mbedtls/platform.h>
@@ -73,6 +73,6 @@ void mbedtls_test_platform_get_entropy_set_entropy_content(size_t val);
/* Return the number of times mbedtls_platform_get_entropy() was called. */ /* Return the number of times mbedtls_platform_get_entropy() was called. */
size_t mbedtls_test_platform_get_entropy_get_call_count(void); size_t mbedtls_test_platform_get_entropy_get_call_count(void);
#endif /* MBEDTLS_PLATFORM_GET_ENTROPY_ALT || MBEDTLS_PSA_DRIVER_GET_ENTROPY */ #endif /* MBEDTLS_PSA_DRIVER_GET_ENTROPY */
#endif /* FAKE_EXTERNAL_RNG_FOR_TEST_H */ #endif /* FAKE_EXTERNAL_RNG_FOR_TEST_H */
tests/src/fake_external_rng_for_test.c
+3 -17
View File
@@ -55,7 +55,7 @@ psa_status_t mbedtls_psa_external_get_random(
#endif /* MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG */ #endif /* MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG */
#if defined(MBEDTLS_PLATFORM_GET_ENTROPY_ALT) || defined(MBEDTLS_PSA_DRIVER_GET_ENTROPY) #if defined(MBEDTLS_PSA_DRIVER_GET_ENTROPY)
#include <test/random.h> #include <test/random.h>
@@ -130,7 +130,7 @@ static int fake_get_entropy(unsigned char *output, size_t output_size,
return 0; return 0;
} }
#endif /* MBEDTLS_PLATFORM_GET_ENTROPY_ALT || MBEDTLS_PSA_DRIVER_GET_ENTROPY */ #endif /* MBEDTLS_PSA_DRIVER_GET_ENTROPY */
#if defined(MBEDTLS_PSA_DRIVER_GET_ENTROPY) #if defined(MBEDTLS_PSA_DRIVER_GET_ENTROPY)
int mbedtls_platform_get_entropy(psa_driver_get_entropy_flags_t flags, int mbedtls_platform_get_entropy(psa_driver_get_entropy_flags_t flags,
@@ -145,18 +145,4 @@ int mbedtls_platform_get_entropy(psa_driver_get_entropy_flags_t flags,
int ret = fake_get_entropy(output, output_size, estimate_bits); int ret = fake_get_entropy(output, output_size, estimate_bits);
return ret; return ret;
} }
#elif defined(MBEDTLS_PLATFORM_GET_ENTROPY_ALT) #endif /* MBEDTLS_PSA_DRIVER_GET_ENTROPY */
int mbedtls_platform_get_entropy(unsigned char *output, size_t output_size,
size_t *output_len, size_t *entropy_content)
{
int ret = fake_get_entropy(output, output_size, entropy_content);
if (ret == 0) {
if (platform_get_entropy_forced_output_len == SIZE_MAX) {
*output_len = output_size;
} else {
*output_len = platform_get_entropy_forced_output_len;
}
}
return ret;
}
#endif /* MBEDTLS_PLATFORM_GET_ENTROPY_ALT */