commit 49bab753f7dbf41ff1c4ca21d24cd63f07c97630
author Ilya Shipitsin <chipitsine@gmail.com> Sat Feb 06 18:59:22 2021 +0500
committer Christopher Faulet <cfaulet@haproxy.com> Mon Feb 22 10:23:24 2021 +0100
tree ea14958096d453e67becb9d9155069705e0af86f
parent e4f38f9bdf37aeb85bd2b84422839e7e12f154e4

BUILD: ssl: guard SSL_CTX_add_server_custom_ext with special macro

special guard macros HAVE_SSL_CTX_ADD_SERVER_CUSTOM_EXT was defined earlier
exactly for guarding SSL_CTX_add_server_custom_ext, let us use it wherever
appropriate

(cherry picked from commit f00cdb18563e6f57a4ad6c0b40e0116ca9c8fd69)
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 b9d52ee..f142b0b 100644
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -6641,7 +6641,7 @@
 
 INITCALL1(STG_REGISTER, http_req_keywords_register, &http_req_actions);
 
-#if (HA_OPENSSL_VERSION_NUMBER >= 0x1000200fL && !defined OPENSSL_NO_TLSEXT && !defined OPENSSL_IS_BORINGSSL)
+#ifdef HAVE_SSL_CTX_ADD_SERVER_CUSTOM_EXT
 
 static void ssl_sock_sctl_free_func(void *parent, void *ptr, CRYPTO_EX_DATA *ad, int idx, long argl, void *argp)
 {
@@ -6739,7 +6739,7 @@
 #if defined(USE_THREAD) && (HA_OPENSSL_VERSION_NUMBER < 0x10100000L)
 	ssl_locking_init();
 #endif
-#if (HA_OPENSSL_VERSION_NUMBER >= 0x1000200fL && !defined OPENSSL_NO_TLSEXT && !defined OPENSSL_IS_BORINGSSL)
+#ifdef HAVE_SSL_CTX_ADD_SERVER_CUSTOM_EXT
 	sctl_ex_index = SSL_CTX_get_ex_new_index(0, NULL, NULL, NULL, ssl_sock_sctl_free_func);
 #endif