From: Hugo Landau <hlandau@openssl.org>
Date: Wed, 30 Nov 2022 08:02:50 +0000 (+0000)
Subject: QUIC Front End I/O API: Remove unnecessary code from SSL_get_tick_timeout
X-Git-Tag: openssl-3.2.0-alpha1~1478
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1660c9422c8fef9e7c74d1dedd249106d4be18b;p=thirdparty%2Fopenssl.git

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)
---

diff --git a/ssl/quic/quic_impl.c b/ssl/quic/quic_impl.c
index 9dab1a92748..682ca6484f8 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;
 }