From 70bf06e5f0823cd414bd1c9504a064c5de9fe97b Mon Sep 17 00:00:00 2001 From: William Lallemand Date: Wed, 16 Sep 2020 18:08:14 +0200 Subject: [PATCH] BUILD: fix build with openssl < 1.0.2 since bundle removal Bundle removal broke the build with openssl version < 1.0.2. Remove the #ifdef around SSL_SOCK_KEYTYPE_NAMES. --- include/haproxy/ssl_sock-t.h | 4 ---- src/ssl_sock.c | 2 -- 2 files changed, 6 deletions(-) diff --git a/include/haproxy/ssl_sock-t.h b/include/haproxy/ssl_sock-t.h index dd5f0f933..a436a4a88 100644 --- a/include/haproxy/ssl_sock-t.h +++ b/include/haproxy/ssl_sock-t.h @@ -292,16 +292,12 @@ struct global_ssl { int extra_files; /* which files not defined in the configuration file are we looking for */ }; -#if HA_OPENSSL_VERSION_NUMBER >= 0x1000200fL /* The order here matters for picking a default context, * keep the most common keytype at the bottom of the list */ extern const char *SSL_SOCK_KEYTYPE_NAMES[]; #define SSL_SOCK_NUM_KEYTYPES 3 -#else -#define SSL_SOCK_NUM_KEYTYPES 1 -#endif #endif /* USE_OPENSSL */ #endif /* _HAPROXY_SSL_SOCK_T_H */ diff --git a/src/ssl_sock.c b/src/ssl_sock.c index 03580ddc3..aa9061a6b 100644 --- a/src/ssl_sock.c +++ b/src/ssl_sock.c @@ -489,7 +489,6 @@ __decl_rwlock(ssl_ctx_lru_rwlock); #endif // SSL_CTRL_SET_TLSEXT_HOSTNAME -#if HA_OPENSSL_VERSION_NUMBER >= 0x1000200fL /* The order here matters for picking a default context, * keep the most common keytype at the bottom of the list */ @@ -498,7 +497,6 @@ const char *SSL_SOCK_KEYTYPE_NAMES[] = { "ecdsa", "rsa" }; -#endif static struct shared_context *ssl_shctx = NULL; /* ssl shared session cache */ static struct eb_root *sh_ssl_sess_tree; /* ssl shared session tree */