From 461e8d288d1854b4b4575931792a089d40f2a9f0 Mon Sep 17 00:00:00 2001 From: Jerry Yu Date: Thu, 30 Jun 2022 13:57:19 +0800 Subject: [PATCH] Revert "fix test fail when seedfile not created" This reverts commit 0b473dbd471e6c128c6fa3a8651c6d783927d182. Signed-off-by: Jerry Yu --- programs/ssl/ssl_client2.c | 5 ---- programs/ssl/ssl_server2.c | 5 ---- programs/ssl/ssl_test_common_source.c | 36 --------------------------- 3 files changed, 46 deletions(-) diff --git a/programs/ssl/ssl_client2.c b/programs/ssl/ssl_client2.c index c21c44f9b3..f6a6bb6d9d 100644 --- a/programs/ssl/ssl_client2.c +++ b/programs/ssl/ssl_client2.c @@ -840,11 +840,6 @@ int main(int argc, char *argv[]) #endif #if defined(MBEDTLS_USE_PSA_CRYPTO) || defined(MBEDTLS_SSL_PROTO_TLS1_3) -#if defined(MBEDTLS_ENTROPY_C) && \ - defined(MBEDTLS_ENTROPY_NV_SEED) && \ - !defined(MBEDTLS_NO_PLATFORM_ENTROPY) - create_entropy_seed_file(); -#endif status = psa_crypto_init(); if (status != PSA_SUCCESS) { mbedtls_fprintf(stderr, "Failed to initialize PSA Crypto implementation: %d\n", diff --git a/programs/ssl/ssl_server2.c b/programs/ssl/ssl_server2.c index 6c46582935..3e2360ed6b 100644 --- a/programs/ssl/ssl_server2.c +++ b/programs/ssl/ssl_server2.c @@ -1650,11 +1650,6 @@ int main(int argc, char *argv[]) #endif #if defined(MBEDTLS_USE_PSA_CRYPTO) || defined(MBEDTLS_SSL_PROTO_TLS1_3) -#if defined(MBEDTLS_ENTROPY_C) && \ - defined(MBEDTLS_ENTROPY_NV_SEED) && \ - !defined(MBEDTLS_NO_PLATFORM_ENTROPY) - create_entropy_seed_file(); -#endif status = psa_crypto_init(); if (status != PSA_SUCCESS) { mbedtls_fprintf(stderr, "Failed to initialize PSA Crypto implementation: %d\n", diff --git a/programs/ssl/ssl_test_common_source.c b/programs/ssl/ssl_test_common_source.c index f5a33535dc..1ff2077d4a 100644 --- a/programs/ssl/ssl_test_common_source.c +++ b/programs/ssl/ssl_test_common_source.c @@ -373,39 +373,3 @@ void mbedtls_print_supported_sig_algs(void) mbedtls_printf("ecdsa_sha1\n"); mbedtls_printf("\n"); } -#if defined(MBEDTLS_USE_PSA_CRYPTO) || defined(MBEDTLS_SSL_PROTO_TLS1_3) -#if defined(MBEDTLS_ENTROPY_C) && \ - defined(MBEDTLS_ENTROPY_NV_SEED) && \ - !defined(MBEDTLS_NO_PLATFORM_ENTROPY) -static void create_entropy_seed_file(void) -{ - int result; - size_t output_len = 0; - unsigned char seed_value[MBEDTLS_ENTROPY_BLOCK_SIZE]; - - /* Attempt to read the entropy seed file. If this fails - attempt to write - * to the file to ensure one is present. */ - result = mbedtls_platform_std_nv_seed_read(seed_value, - MBEDTLS_ENTROPY_BLOCK_SIZE); - if (0 == result) { - return; - } - - result = mbedtls_platform_entropy_poll(NULL, - seed_value, - MBEDTLS_ENTROPY_BLOCK_SIZE, - &output_len); - if (0 != result) { - return; - } - - if (MBEDTLS_ENTROPY_BLOCK_SIZE != output_len) { - return; - } - - mbedtls_platform_std_nv_seed_write(seed_value, MBEDTLS_ENTROPY_BLOCK_SIZE); -} -#endif /* MBEDTLS_ENTROPY_C && - MBEDTLS_ENTROPY_NV_SEED && - !MBEDTLS_NO_PLATFORM_ENTROPY */ -#endif