commit e7f81bca61a189b516969b6a19947ed4d69a72ae
author Ilya Shipitsin <chipitsine@gmail.com> Fri Nov 27 02:39:48 2020 +0500
committer Christopher Faulet <cfaulet@haproxy.com> Wed Jan 06 13:48:21 2021 +0100
tree 0227d98205cdc09fd006746f570ab700bea08b8a
parent f13c7dbe51f3eda453c6aa596b3b56e2274c106d

BUILD: SSL: fine guard for SSL_CTX_add_server_custom_ext call

SSL_CTX_add_server_custom_ext is openssl specific function present
since openssl-1.0.2, let us define readable guard for it, not depending
on HA_OPENSSL_VERSION

(cherry picked from commit ec609098718b9c1cd803ca57442b2b98c9ba4a16)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>

src/ssl_sock.c

diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index b8ba625..9456b7a 100644
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -1453,7 +1453,7 @@
 #endif
 
 
-#if (HA_OPENSSL_VERSION_NUMBER >= 0x1000200fL && !defined OPENSSL_NO_TLSEXT && !defined OPENSSL_IS_BORINGSSL)
+#ifdef HAVE_SL_CTX_ADD_SERVER_CUSTOM_EXT
 
 #define CT_EXTENSION_TYPE 18
 
@@ -3126,7 +3126,7 @@
 	}
 #endif
 
-#if (HA_OPENSSL_VERSION_NUMBER >= 0x1000200fL && !defined OPENSSL_NO_TLSEXT && !defined OPENSSL_IS_BORINGSSL)
+#ifdef HAVE_SL_CTX_ADD_SERVER_CUSTOM_EXT
 	if (sctl_ex_index >= 0 && ckch->sctl) {
 		if (ssl_sock_load_sctl(ctx, ckch->sctl) < 0) {
 			memprintf(err, "%s '%s.sctl' is present but cannot be read or parsed'.\n",