From: Frederic Lecaille <flecaille@haproxy.com>
Date: Wed, 24 Jan 2024 13:36:41 +0000 (+0100)
Subject: BUILD: quic: Fix build error when building QUIC against wolfssl.
X-Git-Tag: v3.0-dev2~20
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=40f99023881e4f0112a4c4d1818d29b771d2821f;p=thirdparty%2Fhaproxy.git

BUILD: quic: Fix build error when building QUIC against wolfssl.

This commit:

    "MINOR: quic: Enable early data at SSL session level (aws-lc)

introduced a build error when using wolfssl as TLS stack
because it references unknown function wolfSSL_set_quic_early_data_enabled()
which is not defined in qc_set_quic_early_data_context() that must not be used
in this case. The compilation of this fonction was enabled for wolfssl when
it should not have by the mentionned commit.

No backport is needed.
---

diff --git a/src/quic_ssl.c b/src/quic_ssl.c
index ca9fb86d7a..91dc107074 100644
--- a/src/quic_ssl.c
+++ b/src/quic_ssl.c
@@ -735,7 +735,7 @@ static int qc_ssl_sess_init(struct quic_conn *qc, SSL_CTX *ssl_ctx, SSL **ssl)
 	return ret;
 }
 
-#ifndef USE_QUIC_OPENSSL_COMPAT
+#if !defined(USE_QUIC_OPENSSL_COMPAT) && !defined(USE_OPENSSL_WOLFSSL)
 
 /* Enable early data for <ssl> QUIC TLS session.
  * Return 1 if succeeded, 0 if not.
@@ -808,7 +808,7 @@ int qc_alloc_ssl_sock_ctx(struct quic_conn *qc)
 		if (qc_ssl_sess_init(qc, bc->initial_ctx, &ctx->ssl) == -1)
 		        goto err;
 #if (HA_OPENSSL_VERSION_NUMBER >= 0x10101000L)
-#ifndef USE_QUIC_OPENSSL_COMPAT
+#if !defined(USE_QUIC_OPENSSL_COMPAT) && !defined(USE_OPENSSL_WOLFSSL)
 		/* Enabling 0-RTT */
 		if (bc->ssl_conf.early_data && !qc_set_quic_early_data_enabled(qc, ctx->ssl))
 			goto err;