mirror of
https://github.com/Mbed-TLS/mbedtls.git
synced 2025-07-29 11:41:15 +03:00
pre-test version of the mbedtls_ssl_conf_rng removal
Signed-off-by: Ben Taylor <ben.taylor@linaro.org>
This commit is contained in:
@ -2133,14 +2133,14 @@ static int ssl_write_server_hello(mbedtls_ssl_context *ssl)
|
||||
MBEDTLS_SSL_DEBUG_MSG(3, ("server hello, current time: %" MBEDTLS_PRINTF_LONGLONG,
|
||||
(long long) t));
|
||||
#else
|
||||
if ((ret = ssl->conf->f_rng(ssl->conf->p_rng, p, 4)) != 0) {
|
||||
if ((ret = psa_generate_random(ssl->conf->p_rng, p, 4)) != 0) {
|
||||
return ret;
|
||||
}
|
||||
|
||||
p += 4;
|
||||
#endif /* MBEDTLS_HAVE_TIME */
|
||||
|
||||
if ((ret = ssl->conf->f_rng(ssl->conf->p_rng, p, 20)) != 0) {
|
||||
if ((ret = psa_generate_random(p, 20)) != 0) {
|
||||
return ret;
|
||||
}
|
||||
p += 20;
|
||||
@ -2166,7 +2166,8 @@ static int ssl_write_server_hello(mbedtls_ssl_context *ssl)
|
||||
} else
|
||||
#endif
|
||||
{
|
||||
if ((ret = ssl->conf->f_rng(ssl->conf->p_rng, p, 8)) != 0) {
|
||||
|
||||
if ((ret = psa_generate_random(p, 8)) != 0) {
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
@ -2197,7 +2198,7 @@ static int ssl_write_server_hello(mbedtls_ssl_context *ssl)
|
||||
#endif /* MBEDTLS_SSL_SESSION_TICKETS */
|
||||
{
|
||||
ssl->session_negotiate->id_len = n = 32;
|
||||
if ((ret = ssl->conf->f_rng(ssl->conf->p_rng, ssl->session_negotiate->id,
|
||||
if ((ret = psa_generate_random(ssl->session_negotiate->id,
|
||||
n)) != 0) {
|
||||
return ret;
|
||||
}
|
||||
|
Reference in New Issue
Block a user