openssl
/
openssl
mirror of https://github.com/openssl/openssl
1
0
Fork 0
Code Issues Releases Wiki Activity

Use OSSL_TIME instead of using arithmetic directly on time_t 

We have functions for adding/subtracting time. We should use them.

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23966)
This commit is contained in:
Matt Caswell 2024-03-25 11:53:35 +00:00
parent af75373eea
commit afb6ce0d0f
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
test/sslapitest.c
View File

@ -3375,6 +3375,16 @@ static unsigned int psk_server_cb(SSL *ssl, const char *identity,
static int artificial_ticket_time = 0;
static int sub_session_time(SSL_SESSION *sess)
{
OSSL_TIME tick_time;
tick_time = ossl_time_from_time_t(SSL_SESSION_get_time_ex(sess));
tick_time = ossl_time_subtract(tick_time, ossl_seconds2time(10));
return SSL_SESSION_set_time_ex(sess, ossl_time_to_time_t(tick_time)) != 0;
}
static int ed_gen_cb(SSL *s, void *arg)
{
SSL_SESSION *sess = SSL_get0_session(s);
@ -3390,10 +3400,7 @@ static int ed_gen_cb(SSL *s, void *arg)
return 1;
artificial_ticket_time--;
if (SSL_SESSION_set_time_ex(sess, SSL_SESSION_get_time_ex(sess) - 10) == 0)
return 0;
return 1;
return sub_session_time(sess);
}
/*
@ -3493,8 +3500,7 @@ static int setupearly_data_test(SSL_CTX **cctx, SSL_CTX **sctx, SSL **clientssl,
* gave it on the server side
*/
if (artificial
&& !TEST_time_t_gt(SSL_SESSION_set_time_ex(*sess,
SSL_SESSION_get_time_ex(*sess) - 10), 0))
&& !TEST_true(sub_session_time(*sess)))
return 0;
if (!TEST_true(create_ssl_objects(*sctx, *cctx, serverssl,