]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
BUG/MINOR: ssl: fix build of X509_chain_up_ref() w/ libreSSL
authorWilliam Lallemand <wlallemand@haproxy.com>
Wed, 23 Oct 2019 21:15:46 +0000 (23:15 +0200)
committerWilliam Lallemand <wlallemand@haproxy.org>
Wed, 23 Oct 2019 21:20:08 +0000 (23:20 +0200)
LibreSSL brought X509_chain_up_ref() in 2.7.5, so no need to build our
own version starting from this version.

include/common/openssl-compat.h

index 030070aa22982c305d64f428eeeecb76bb6e8a9c..00395d3e7170d2ddd7ebc25555f10132d0ee8106 100644 (file)
@@ -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)