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 dd5f0f9339b6e0948433ca6e853444ba3183d588..a436a4a880d32670862137338c9fb8353ebf8c9c 100644 (file)
--- 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 03580ddc3cc3b04e57174ff6854a1db8b91fc3c7..aa9061a6b3da1377d995d2497b6a84ca1c02e76b 100644 (file)
--- 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 */