RepoMirrors
/
haproxy
mirror of http://git.haproxy.org/git/haproxy.git/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MINOR: ssl: rename HA_OPENSSL_HAVE_0RTT_SUPPORT constant to HAVE_SSL_0RTT_QUIC 

Rename the constant to be me more comprehensive.
This commit is contained in:
William Lallemand 2024-01-29 18:26:19 +01:00
parent f5353f2c45
commit 025f5105ee
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/haproxy/openssl-compat.h
View File

@ -115,7 +115,7 @@
/* At this time, wolfssl, libressl and the openssl QUIC compatibility do not support 0-RTT */ /* At this time, wolfssl, libressl and the openssl QUIC compatibility do not support 0-RTT */
#if defined(HAVE_SSL_0RTT) && !defined(USE_QUIC_OPENSSL_COMPAT) && !defined(LIBRESSL_VERSION_NUMBER) && !defined(USE_OPENSSL_WOLFSSL) #if defined(HAVE_SSL_0RTT) && !defined(USE_QUIC_OPENSSL_COMPAT) && !defined(LIBRESSL_VERSION_NUMBER) && !defined(USE_OPENSSL_WOLFSSL)
#define HA_OPENSSL_HAVE_0RTT_SUPPORT #define HAVE_SSL_0RTT_QUIC
#endif #endif
#if (HA_OPENSSL_VERSION_NUMBER >= 0x3000000fL) #if (HA_OPENSSL_VERSION_NUMBER >= 0x3000000fL)

6
src/quic_ssl.c
View File

@ -735,7 +735,7 @@ static int qc_ssl_sess_init(struct quic_conn *qc, SSL_CTX *ssl_ctx, SSL **ssl)
return ret; return ret;
} }
#ifdef HA_OPENSSL_HAVE_0RTT_SUPPORT #ifdef HAVE_SSL_0RTT_QUIC
/* Enable early data for <ssl> QUIC TLS session. /* Enable early data for <ssl> QUIC TLS session.
* Return 1 if succeeded, 0 if not. * Return 1 if succeeded, 0 if not.
@ -770,7 +770,7 @@ static int qc_set_quic_early_data_enabled(struct quic_conn *qc, SSL *ssl)
return 1; return 1;
} }
#endif // HA_OPENSSL_HAVE_0RTT_SUPPORT #endif // HAVE_SSL_0RTT_QUIC
/* Allocate the ssl_sock_ctx from connection <qc>. This creates the tasklet /* Allocate the ssl_sock_ctx from connection <qc>. This creates the tasklet
* used to process <qc> received packets. The allocated context is stored in * used to process <qc> received packets. The allocated context is stored in
@ -807,7 +807,7 @@ int qc_alloc_ssl_sock_ctx(struct quic_conn *qc)
if (qc_is_listener(qc)) { if (qc_is_listener(qc)) {
if (qc_ssl_sess_init(qc, bc->initial_ctx, &ctx->ssl) == -1) if (qc_ssl_sess_init(qc, bc->initial_ctx, &ctx->ssl) == -1)
goto err; goto err;
#if (HA_OPENSSL_VERSION_NUMBER >= 0x10101000L) && defined(HA_OPENSSL_HAVE_0RTT_SUPPORT) #if (HA_OPENSSL_VERSION_NUMBER >= 0x10101000L) && defined(HAVE_SSL_0RTT_QUIC)
/* Enabling 0-RTT */ /* Enabling 0-RTT */
if (bc->ssl_conf.early_data && !qc_set_quic_early_data_enabled(qc, ctx->ssl)) if (bc->ssl_conf.early_data && !qc_set_quic_early_data_enabled(qc, ctx->ssl))
goto err; goto err;