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.
diff --git a/include/haproxy/ssl_sock-t.h b/include/haproxy/ssl_sock-t.h
index dd5f0f9..a436a4a 100644
--- a/include/haproxy/ssl_sock-t.h
+++ b/include/haproxy/ssl_sock-t.h
@@ -292,16 +292,12 @@
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 03580dd..aa9061a 100644
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -489,7 +489,6 @@
#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 @@
"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 */