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

MINOR: quic: avoid code duplication in TLS alert callback

Browse Source 
Both the OpenSSL QUIC API TLS alert callback ha_quic_ossl_alert() does exactly
the same thing than the one for quictls API, even if the parameter have different
types.

Call ha_quic_send_alert() quictls callback from ha_quic_ossl_alert OpenSSL
QUIC API callback to avoid such code duplication.
This commit is contained in:
Frederic Lecaille 2025-12-01 16:35:58 +01:00
parent 8dbecbce31
commit c780bf777a
1 changed files with 14 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/quic_ssl.c
View File

@ -162,6 +162,19 @@ static int qc_ssl_crypto_data_cpy(struct quic_conn *qc, struct quic_enc_level *q
return ret; return ret;
} }
static int ha_quic_send_alert(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert)
{
struct quic_conn *qc = SSL_get_ex_data(ssl, ssl_qc_app_data_index);
TRACE_ENTER(QUIC_EV_CONN_SSLALERT, qc);
TRACE_PROTO("Received TLS alert", QUIC_EV_CONN_SSLALERT, qc, &alert, &level);
quic_set_tls_alert(qc, alert);
TRACE_LEAVE(QUIC_EV_CONN_SSLALERT, qc);
return 1;
}
/* returns 0 on error, 1 on success */ /* returns 0 on error, 1 on success */
static int ha_quic_set_encryption_secrets(SSL *ssl, enum ssl_encryption_level_t level, static int ha_quic_set_encryption_secrets(SSL *ssl, enum ssl_encryption_level_t level,
const uint8_t *read_secret, const uint8_t *read_secret,
@ -628,17 +641,7 @@ leave:
*/ */
static int ha_quic_ossl_alert(SSL *ssl, unsigned char alert_code, void *arg) static int ha_quic_ossl_alert(SSL *ssl, unsigned char alert_code, void *arg)
{ {
int ret = 1, alert = alert_code; return ha_quic_send_alert(ssl, -1, alert_code);
struct quic_conn *qc = SSL_get_ex_data(ssl, ssl_qc_app_data_index);
TRACE_ENTER(QUIC_EV_CONN_SSLALERT, qc);
TRACE_PROTO("Received TLS alert", QUIC_EV_CONN_SSLALERT, qc, &alert);
quic_set_tls_alert(qc, alert_code);
TRACE_LEAVE(QUIC_EV_CONN_SSLALERT, qc);
return ret;
} }
static const OSSL_DISPATCH ha_quic_dispatch[] = { static const OSSL_DISPATCH ha_quic_dispatch[] = {
@ -702,19 +705,6 @@ static int ha_quic_flush_flight(SSL *ssl)
return 1; return 1;
} }
static int ha_quic_send_alert(SSL *ssl, enum ssl_encryption_level_t level, uint8_t alert)
{
struct quic_conn *qc = SSL_get_ex_data(ssl, ssl_qc_app_data_index);
TRACE_ENTER(QUIC_EV_CONN_SSLALERT, qc);
TRACE_PROTO("Received TLS alert", QUIC_EV_CONN_SSLALERT, qc, &alert, &level);
quic_set_tls_alert(qc, alert);
TRACE_LEAVE(QUIC_EV_CONN_SSLALERT, qc);
return 1;
}
/* QUIC TLS methods */ /* QUIC TLS methods */
#if defined(OPENSSL_IS_AWSLC) #if defined(OPENSSL_IS_AWSLC)
/* write/read set secret split */ /* write/read set secret split */