diff options
| author | Pauli <pauli@openssl.org> | 2022-08-29 14:17:25 +1000 |
|---|---|---|
| committer | Pauli <pauli@openssl.org> | 2022-09-13 21:13:22 +1000 |
| commit | f0131dc04a39afcb1629f5bec2814ef3a4925bbf (patch) | |
| tree | ef87562f06970c15ee98084df86beaec0f49c729 /ssl/s3_lib.c | |
| parent | 364c3b7b1ac3172dbe2108be23ae215b86ef8e08 (diff) | |
ssl: modify libssl so that it uses OSSL_TIME
This is instead of time_t and struct timeval. Some public APIs mandate a
presence of these two types, but they are converted to OSSL_TIME internally.
Reviewed-by: Todd Short <todd.short@me.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/19082)
Diffstat (limited to 'ssl/s3_lib.c')
| -rw-r--r-- | ssl/s3_lib.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c index ceae7faf9f..126ac4c2bf 100644 --- a/ssl/s3_lib.c +++ b/ssl/s3_lib.c @@ -3286,13 +3286,13 @@ const SSL3_ENC_METHOD SSLv3_enc_data = { ssl3_handshake_write }; -long ssl3_default_timeout(void) +OSSL_TIME ssl3_default_timeout(void) { /* * 2 hours, the 24 hours mentioned in the SSLv3 spec is way too long for * http, the cache would over fill */ - return (60 * 60 * 2); + return ossl_seconds2time(60 * 60 * 2); } int ssl3_num_ciphers(void) |