mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-03-24 19:43:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ssl_helpers: remove guard for rng_get()

Browse Source 
After adding a check in ssl_conf_check(), we have configured RNG via
mbedtls_ssl_conf_rng() for TLS tests in both test_suite_ssl.function
and test_suite_debug.function. As a result, rng_get() is not only
available when MBEDTLS_SSL_HANDSHAKE_WITH_CERT_ENABLED enabled.
Therefore, we remove the guard for rng_get() to make it accessible for
TLS tests which have call for mbedtls_ssl_setup().

Signed-off-by: Yanray Wang <yanray.wang@arm.com>
This commit is contained in:
Yanray Wang 2023-12-01 23:34:27 +08:00
parent 197199f154
commit a72bc9adf7
2 changed files with 2 additions and 5 deletions
tests
include/test
ssl_helpers.h
src/test_helpers
ssl_helpers.c

2
tests/include/test/ssl_helpers.h

@ -193,9 +193,7 @@ typedef struct mbedtls_test_ssl_endpoint {
#endif /* MBEDTLS_SSL_HANDSHAKE_WITH_CERT_ENABLED */
#if defined(MBEDTLS_SSL_HANDSHAKE_WITH_CERT_ENABLED)
int rng_get(void *p_rng, unsigned char *output, size_t output_len);
#endif
/*
* This function can be passed to mbedtls to receive output logs from it. In

5
tests/src/test_helpers/ssl_helpers.c

@ -12,8 +12,6 @@
#include "md_psa.h"
#if defined(MBEDTLS_SSL_TLS_C)
#if defined(MBEDTLS_SSL_HANDSHAKE_WITH_CERT_ENABLED)
static int rng_seed = 0xBEEF;
int rng_get(void *p_rng, unsigned char *output, size_t output_len)
{
(void) p_rng;
@ -23,7 +21,6 @@ int rng_get(void *p_rng, unsigned char *output, size_t output_len)
return 0;
}
#endif
void mbedtls_test_ssl_log_analyzer(void *ctx, int level,
const char *file, int line,
@ -46,6 +43,8 @@ void mbedtls_test_init_handshake_options(
mbedtls_test_handshake_test_options *opts)
{
#if defined(MBEDTLS_SSL_HANDSHAKE_WITH_CERT_ENABLED)
int rng_seed = 0xBEEF;
srand(rng_seed);
rng_seed += 0xD0;
#endif