]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
MINOR: ssl: rename HA_OPENSSL_HAVE_0RTT_SUPPORT constant to HAVE_SSL_0RTT_QUIC
authorWilliam Lallemand <wlallemand@haproxy.com>
Mon, 29 Jan 2024 17:26:19 +0000 (18:26 +0100)
committerWilliam Lallemand <wlallemand@haproxy.com>
Wed, 31 Jan 2024 10:57:54 +0000 (11:57 +0100)
Rename the constant to be me more comprehensive.

include/haproxy/openssl-compat.h
src/quic_ssl.c

index b07251758895eac710d37e9b79e310d46a039fdd..37dfa3b246ed06a6362c105d728d0dedcd7e4268 100644 (file)
 
 /* 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)
-#define HA_OPENSSL_HAVE_0RTT_SUPPORT
+#define HAVE_SSL_0RTT_QUIC
 #endif
 
 #if (HA_OPENSSL_VERSION_NUMBER >= 0x3000000fL)
index d4726079db6f578bc8886bb62a530b61c2a92649..485499a0994c17bef6820ed1c7576baffefcc9f3 100644 (file)
@@ -735,7 +735,7 @@ static int qc_ssl_sess_init(struct quic_conn *qc, SSL_CTX *ssl_ctx, SSL **ssl)
        return ret;
 }
 
-#ifdef HA_OPENSSL_HAVE_0RTT_SUPPORT
+#ifdef HAVE_SSL_0RTT_QUIC
 
 /* Enable early data for <ssl> QUIC TLS session.
  * 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;
 }
-#endif // HA_OPENSSL_HAVE_0RTT_SUPPORT
+#endif // HAVE_SSL_0RTT_QUIC
 
 /* Allocate the ssl_sock_ctx from connection <qc>. This creates the tasklet
  * 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_ssl_sess_init(qc, bc->initial_ctx, &ctx->ssl) == -1)
                        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 */
                if (bc->ssl_conf.early_data && !qc_set_quic_early_data_enabled(qc, ctx->ssl))
                        goto err;