From: Willy Tarreau <w@1wt.eu>
Date: Mon, 30 Aug 2021 07:35:18 +0000 (+0200)
Subject: BUILD: ssl: fix two remaining occurrences of #if USE_OPENSSL
X-Git-Tag: v2.5-dev6~29
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b131049eb5ba5b0e7c02eea10ce9763da4428abe;p=thirdparty%2Fhaproxy.git

BUILD: ssl: fix two remaining occurrences of #if USE_OPENSSL

One was in backend.c and the other one in hlua.c. No other candidate
was found with "git grep '^#if\s*USE'". It's worth noting that 3
other such tests exist for SSL_OP_NO_{SSLv3,TLSv1_1,TLSv1_2} but
that these ones are properly set to 0 in openssl-compat.h when not
defined.
---

diff --git a/src/backend.c b/src/backend.c
index adbd60605a..7143ba65d0 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -1662,7 +1662,7 @@ skip_reuse:
 		}
 	}
 
-#if USE_OPENSSL && (defined(OPENSSL_IS_BORINGSSL) || (HA_OPENSSL_VERSION_NUMBER >= 0x10101000L))
+#if defined(USE_OPENSSL) && (defined(OPENSSL_IS_BORINGSSL) || (HA_OPENSSL_VERSION_NUMBER >= 0x10101000L))
 
 	if (!reuse && cli_conn && srv && srv_conn->mux &&
 	    (srv->ssl_ctx.options & SRV_SSL_O_EARLY_DATA) &&
diff --git a/src/hlua.c b/src/hlua.c
index 7b280884db..039ebeca77 100644
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -10952,7 +10952,7 @@ int hlua_post_init()
 	struct hlua_function *fcn;
 	struct hlua_reg_filter *reg_flt;
 
-#if USE_OPENSSL
+#if defined(USE_OPENSSL)
 	/* Initialize SSL server. */
 	if (socket_ssl->xprt->prepare_srv) {
 		int saved_used_backed = global.ssl_used_backend;