RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-04-10 11:11:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: server: Make 'default-server' support 'ca-file', 'crl-file' and 'crt' settings.

Browse Source 
This patch makes 'default-server' directives support 'ca-file', 'crl-file' and
'crt' settings.
This commit is contained in:
Fr�d�ric L�caille 2017-03-14 15:52:04 +01:00 committed by Willy Tarreau
parent 67e0e61316
commit 5e57643e09
2 changed files with 9 additions and 3 deletions

6
src/server.c
View File

@ -1338,6 +1338,12 @@ int parse_server(const char *file, int linenum, char **args, struct proxy *curpr
newsrv->init_addr = curproxy->defsrv.init_addr;
#if defined(USE_OPENSSL)
/* SSL config. */
if (curproxy->defsrv.ssl_ctx.ca_file != NULL)
newsrv->ssl_ctx.ca_file = strdup(curproxy->defsrv.ssl_ctx.ca_file);
if (curproxy->defsrv.ssl_ctx.crl_file != NULL)
newsrv->ssl_ctx.crl_file = strdup(curproxy->defsrv.ssl_ctx.crl_file);
if (curproxy->defsrv.ssl_ctx.client_crt != NULL)
newsrv->ssl_ctx.client_crt = strdup(curproxy->defsrv.ssl_ctx.crl_file);
newsrv->ssl_ctx.verify = curproxy->defsrv.ssl_ctx.verify;
if (curproxy->defsrv.ssl_ctx.verify_host != NULL)
newsrv->ssl_ctx.verify_host = strdup(curproxy->defsrv.ssl_ctx.verify_host);

6
src/ssl_sock.c
View File

@ -7485,11 +7485,11 @@ static struct bind_kw_list bind_kws = { "SSL", { }, {
* not enabled.
*/
static struct srv_kw_list srv_kws = { "SSL", { }, {
{ "ca-file", srv_parse_ca_file, 1, 0 }, /* set CAfile to process verify server cert */
{ "ca-file", srv_parse_ca_file, 1, 1 }, /* set CAfile to process verify server cert */
{ "check-ssl", srv_parse_check_ssl, 0, 1 }, /* enable SSL for health checks */
{ "ciphers", srv_parse_ciphers, 1, 0 }, /* select the cipher suite */
{ "crl-file", srv_parse_crl_file, 1, 0 }, /* set certificate revocation list file use on server cert verify */
{ "crt", srv_parse_crt, 1, 0 }, /* set client certificate */
{ "crl-file", srv_parse_crl_file, 1, 1 }, /* set certificate revocation list file use on server cert verify */
{ "crt", srv_parse_crt, 1, 1 }, /* set client certificate */
{ "force-sslv3", srv_parse_force_sslv3, 0, 1 }, /* force SSLv3 */
{ "force-tlsv10", srv_parse_force_tlsv10, 0, 1 }, /* force TLSv10 */
{ "force-tlsv11", srv_parse_force_tlsv11, 0, 1 }, /* force TLSv11 */