From: Hugo Landau <hlandau@openssl.org>
Date: Tue, 23 May 2023 11:23:06 +0000 (+0100)
Subject: QUIC TXP: Make TXP use time callback correctly
X-Git-Tag: openssl-3.2.0-alpha1~627
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b98c38d40a9d27a155d88208640430fffa47e28c;p=thirdparty%2Fopenssl.git

QUIC TXP: Make TXP use time callback correctly

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/21029)
---

diff --git a/ssl/quic/quic_txp.c b/ssl/quic/quic_txp.c
index 7c5e4295f38..1acf42104ac 100644
--- a/ssl/quic/quic_txp.c
+++ b/ssl/quic/quic_txp.c
@@ -2197,7 +2197,7 @@ static int txp_generate_for_el_actual(OSSL_QUIC_TX_PACKETISER *txp,
     tpkt->ackm_pkt.is_ack_eliciting = have_ack_eliciting;
     tpkt->ackm_pkt.is_pto_probe     = 0;
     tpkt->ackm_pkt.is_mtu_probe     = 0;
-    tpkt->ackm_pkt.time             = ossl_time_now();
+    tpkt->ackm_pkt.time             = txp->args.now(txp->args.now_arg);
 
     /* Packet Information for QTX */
     pkt.hdr         = phdr;