From: William Lallemand <wlallemand@haproxy.com>
Date: Wed, 23 Oct 2019 21:15:46 +0000 (+0200)
Subject: BUG/MINOR: ssl: fix build of X509_chain_up_ref() w/ libreSSL
X-Git-Tag: v2.1-dev3~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=705e088f0aa72289e26f084261be7010066d73d2;p=thirdparty%2Fhaproxy.git

BUG/MINOR: ssl: fix build of X509_chain_up_ref() w/ libreSSL

LibreSSL brought X509_chain_up_ref() in 2.7.5, so no need to build our
own version starting from this version.
---

diff --git a/include/common/openssl-compat.h b/include/common/openssl-compat.h
index 030070aa22..00395d3e71 100644
--- a/include/common/openssl-compat.h
+++ b/include/common/openssl-compat.h
@@ -117,7 +117,7 @@ static inline int SSL_SESSION_set1_id_context(SSL_SESSION *s, const unsigned cha
 #endif
 
 
-#if (HA_OPENSSL_VERSION_NUMBER < 0x1000200fL)
+#if (HA_OPENSSL_VERSION_NUMBER < 0x1000200fL) && (LIBRESSL_VERSION_NUMBER < 0x2070500fL)
 /* introduced in openssl 1.0.2 */
 
 static inline STACK_OF(X509) *X509_chain_up_ref(STACK_OF(X509) *chain)