diff options
| author | Hugo Landau <hlandau@openssl.org> | 2022-11-30 08:02:50 +0000 |
|---|---|---|
| committer | Hugo Landau <hlandau@openssl.org> | 2023-01-13 13:20:20 +0000 |
| commit | a1660c9422c8fef9e7c74d1dedd249106d4be18b (patch) | |
| tree | 7d83f2c535c58d6860269fbe4bbb390537f99bfa /ssl | |
| parent | e28f512f045b91d4c52b8b9f2ea0800b24203a76 (diff) | |
QUIC Front End I/O API: Remove unnecessary code from SSL_get_tick_timeout
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/19703)
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/quic/quic_impl.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/ssl/quic/quic_impl.c b/ssl/quic/quic_impl.c index 9dab1a9274..682ca6484f 100644 --- a/ssl/quic/quic_impl.c +++ b/ssl/quic/quic_impl.c @@ -411,7 +411,7 @@ int ossl_quic_tick(QUIC_CONNECTION *qc) */ int ossl_quic_get_tick_timeout(QUIC_CONNECTION *qc, struct timeval *tv) { - OSSL_TIME now, deadline = ossl_time_infinite(); + OSSL_TIME deadline = ossl_time_infinite(); if (qc->ch != NULL) deadline @@ -423,14 +423,7 @@ int ossl_quic_get_tick_timeout(QUIC_CONNECTION *qc, struct timeval *tv) return 1; } - now = ossl_time_now(); - if (ossl_time_compare(now, deadline) >= 0) { - tv->tv_sec = 0; - tv->tv_usec = 0; - return 1; - } - - *tv = ossl_time_to_timeval(ossl_time_subtract(deadline, now)); + *tv = ossl_time_to_timeval(ossl_time_subtract(deadline, ossl_time_now())); return 1; } |