mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-07 15:47:01 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Willy Tarreau 2021-08-30 09:35:18 +02:00
parent ea57a9b103
commit b131049eb5
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/backend.c
View File

@ -1662,7 +1662,7 @@ int connect_server(struct stream *s)
} }
} }
#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 && if (!reuse && cli_conn && srv && srv_conn->mux &&
(srv->ssl_ctx.options & SRV_SSL_O_EARLY_DATA) && (srv->ssl_ctx.options & SRV_SSL_O_EARLY_DATA) &&

2
src/hlua.c
View File

@ -10952,7 +10952,7 @@ int hlua_post_init()
struct hlua_function *fcn; struct hlua_function *fcn;
struct hlua_reg_filter *reg_flt; struct hlua_reg_filter *reg_flt;
#if USE_OPENSSL #if defined(USE_OPENSSL)
/* Initialize SSL server. */ /* Initialize SSL server. */
if (socket_ssl->xprt->prepare_srv) { if (socket_ssl->xprt->prepare_srv) {
int saved_used_backed = global.ssl_used_backend; int saved_used_backed = global.ssl_used_backend;