From: William Lallemand <wlallemand@haproxy.org>
Date: Thu, 14 Sep 2023 14:26:58 +0000 (+0200)
Subject: BUILD: quic: fix build on centos 8 and USE_QUIC_OPENSSL_COMPAT
X-Git-Tag: v2.9-dev6~28
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=694889ac2d20ae6c7449b6097211583f9d4bbbd5;p=thirdparty%2Fhaproxy.git

BUILD: quic: fix build on centos 8 and USE_QUIC_OPENSSL_COMPAT

When using USE_QUIC_OPENSSL_COMPAT=1 on centos-8 the build fail this
way:

In file included from src/quic_openssl_compat.c:11:
/usr/include/openssl/kdf.h:33:46: error: unknown type name 'va_list'
 int EVP_KDF_vctrl(EVP_KDF_CTX *ctx, int cmd, va_list args);

This is because of openssl/kdf.h being include before openssl-compat.h
---

diff --git a/src/quic_openssl_compat.c b/src/quic_openssl_compat.c
index 99661377e2..2accb32937 100644
--- a/src/quic_openssl_compat.c
+++ b/src/quic_openssl_compat.c
@@ -6,11 +6,10 @@
 #error "Must define USE_OPENSSL"
 #endif
 
+#include <haproxy/openssl-compat.h>
 /* Highly inspired from nginx QUIC TLS compatibilty code */
-
 #include <openssl/kdf.h>
 
-#include <haproxy/openssl-compat.h>
 #include <haproxy/quic_conn.h>
 #include <haproxy/quic_tls.h>
 #include <haproxy/ssl_sock.h>