From: Frédéric Lécaille <flecaille@haproxy.com>
Date: Thu, 4 Jan 2024 12:56:44 +0000 (+0100)
Subject: BUILD: quic: Missing quic_ssl.h header protection
X-Git-Tag: v3.0-dev1~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fd178ccdb0e0c22ce784d53762bef33b5709bdaa;p=thirdparty%2Fhaproxy.git

BUILD: quic: Missing quic_ssl.h header protection

Such "#ifdef USE_QUIC" prepocessor statements are used by QUIC C header
to avoid inclusion of QUIC headers when the QUIC support is not enabled
(by USE_QUIC make variable). Furthermore, this allows inclusions of QUIC
header from C file without having to protect them with others "#ifdef USE_QUIC"
statements as follows:

   #ifdef USE_QUIC
   #include <a QUIC header>
   #include <another one QUIC header>
   #endif /* USE_QUIC */

So, here if this quic_ssl.h header was included by a C file, and compiled without
QUIC support, this will lead to build errrors as follows:

 In file included from <a C file...>:
        include/haproxy/quic_ssl.h:35:35: warning: ‘enum ssl_encryption_level_t’
        declared inside parameter list will not be visible outside of this
        definition or declaration

Should be backported to 2.9 to avoid such building issues to come.
---

diff --git a/include/haproxy/quic_ssl.h b/include/haproxy/quic_ssl.h
index f564770abe..8f7df47795 100644
--- a/include/haproxy/quic_ssl.h
+++ b/include/haproxy/quic_ssl.h
@@ -21,6 +21,11 @@
 #ifndef _HAPROXY_QUIC_SSL_H
 #define _HAPROXY_QUIC_SSL_H
 
+#ifdef USE_QUIC
+#ifndef USE_OPENSSL
+#error "Must define USE_OPENSSL"
+#endif
+
 #include <haproxy/listener-t.h>
 #include <haproxy/ncbuf-t.h>
 #include <haproxy/openssl-compat.h>
@@ -46,4 +51,5 @@ static inline void qc_free_ssl_sock_ctx(struct ssl_sock_ctx **ctx)
 	*ctx = NULL;
 }
 
+#endif /* USE_QUIC */
 #endif /* _HAPROXY_QUIC_SSL_H */