mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-11-30 15:21:04 +01:00
Code Issues Projects Releases Wiki Activity

CLEANUP: quic: Missing succesful SSL handshake backend trace (OpenSSL 3.5)

Browse Source 
This very minor issue impacts only the backend when compiled against OpenSSL 3.5
with QUIC API (HAVE_OPENSSL_QUIC).

The "SSL handshake OK" trace was not dumped by a TRACE() call. This was very
annoying when debugging.

Modify the concerned code section which is a bit ugly and simplify it.
The TRACE() call is done at a unique location for now on.

Should be backported to 3.2 to ease any further backport.
This commit is contained in:
Frederic Lecaille 2025-11-04 08:20:31 +01:00
parent f0c52f7160
commit 644bf585c3
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/quic_ssl.c
View File

@ -968,10 +968,7 @@ int qc_ssl_do_hanshake(struct quic_conn *qc, struct ssl_sock_ctx *ctx)
} }
#endif #endif
#ifndef HAVE_OPENSSL_QUIC #ifdef HAVE_OPENSSL_QUIC
TRACE_PROTO("SSL handshake OK", QUIC_EV_CONN_IO_CB, qc, &state);
ssl_sock_update_counters(ctx->ssl, counters, counters_px, qc_is_back(qc));
#else
/* Hack to support O-RTT with the OpenSSL 3.5 QUIC API. /* Hack to support O-RTT with the OpenSSL 3.5 QUIC API.
* SSL_do_handshake() succeeds at the first call. Why? |-( * SSL_do_handshake() succeeds at the first call. Why? |-(
* This prevents the handshake CRYPTO data to be sent. * This prevents the handshake CRYPTO data to be sent.
@ -987,12 +984,10 @@ int qc_ssl_do_hanshake(struct quic_conn *qc, struct ssl_sock_ctx *ctx)
QUIC_EV_CONN_IO_CB, qc, &state, &ssl_err); QUIC_EV_CONN_IO_CB, qc, &state, &ssl_err);
goto out; goto out;
} }
else {
TRACE_PROTO("SSL handshake OK", QUIC_EV_CONN_IO_CB, qc, &state);
ssl_sock_update_counters(ctx->ssl, counters, counters_px, qc_is_back(qc));
}
} }
#endif #endif
TRACE_PROTO("SSL handshake OK", QUIC_EV_CONN_IO_CB, qc, &state);
ssl_sock_update_counters(ctx->ssl, counters, counters_px, qc_is_back(qc));
/* Check the alpn could be negotiated */ /* Check the alpn could be negotiated */
if (!qc_is_back(qc)) { if (!qc_is_back(qc)) {