From b131049eb5ba5b0e7c02eea10ce9763da4428abe Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Mon, 30 Aug 2021 09:35:18 +0200 Subject: [PATCH] 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. --- src/backend.c | 2 +- src/hlua.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/backend.c b/src/backend.c index adbd606..7143ba6 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 7b28088..039ebec 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; -- 1.7.10.4