mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-22 22:31:28 +02:00
Code Issues Projects Releases Wiki Activity

BUILD: fix build with openssl < 1.0.2 since bundle removal

Browse Source 
Bundle removal broke the build with openssl version < 1.0.2.

Remove the #ifdef around SSL_SOCK_KEYTYPE_NAMES.
This commit is contained in:
William Lallemand 2020-09-16 18:08:14 +02:00 committed by William Lallemand
parent 98d215e063
commit 70bf06e5f0
2 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/haproxy/ssl_sock-t.h
View File

@ -292,16 +292,12 @@ struct global_ssl {
int extra_files; /* which files not defined in the configuration file are we looking for */ 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, /* The order here matters for picking a default context,
* keep the most common keytype at the bottom of the list * keep the most common keytype at the bottom of the list
*/ */
extern const char *SSL_SOCK_KEYTYPE_NAMES[]; extern const char *SSL_SOCK_KEYTYPE_NAMES[];
#define SSL_SOCK_NUM_KEYTYPES 3 #define SSL_SOCK_NUM_KEYTYPES 3
#else
#define SSL_SOCK_NUM_KEYTYPES 1
#endif
#endif /* USE_OPENSSL */ #endif /* USE_OPENSSL */
#endif /* _HAPROXY_SSL_SOCK_T_H */ #endif /* _HAPROXY_SSL_SOCK_T_H */

2
src/ssl_sock.c
View File

@ -489,7 +489,6 @@ __decl_rwlock(ssl_ctx_lru_rwlock);
#endif // SSL_CTRL_SET_TLSEXT_HOSTNAME #endif // SSL_CTRL_SET_TLSEXT_HOSTNAME
#if HA_OPENSSL_VERSION_NUMBER >= 0x1000200fL
/* The order here matters for picking a default context, /* The order here matters for picking a default context,
* keep the most common keytype at the bottom of the list * keep the most common keytype at the bottom of the list
*/ */
@ -498,7 +497,6 @@ const char *SSL_SOCK_KEYTYPE_NAMES[] = {
"ecdsa", "ecdsa",
"rsa" "rsa"
}; };
#endif
static struct shared_context *ssl_shctx = NULL; /* ssl shared session cache */ static struct shared_context *ssl_shctx = NULL; /* ssl shared session cache */
static struct eb_root *sh_ssl_sess_tree; /* ssl shared session tree */ static struct eb_root *sh_ssl_sess_tree; /* ssl shared session tree */