RepoMirrors
/
haproxy
mirror of http://git.haproxy.org/git/haproxy.git/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MINOR: ssl: add defines LISTEN_DEFAULT_CIPHERS and CONNECT_DEFAULT_CIPHERS. 

These ones are used to set the default ciphers suite on "bind" lines and
"server" lines respectively, instead of using OpenSSL's defaults. These
are probably mainly useful for distro packagers.
This commit is contained in:
Emeric Brun 2012-10-05 15:47:31 +02:00 committed by Willy Tarreau
parent 8694b9a682
commit 76d8895c49
6 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -139,6 +139,11 @@ ADDLIB =
# Use DEFINE=-Dxxx to set any tunable macro. Anything declared here will appear
# in the build options reported by "haproxy -vv". Use SILENT_DEFINE if you do
# not want to pollute the report with complex defines.
# The following settings might be of interest when SSL is enabled :
# LISTEN_DEFAULT_CIPHERS is a cipher suite string used to set the default SSL
# ciphers on "bind" lines instead of using OpenSSL's defaults.
# CONNECT_DEFAULT_CIPHERS is a cipher suite string used to set the default
# SSL ciphers on "server" lines instead of using OpenSSL's defaults.
DEFINE =
SILENT_DEFINE =

10
include/common/defaults.h
View File

@ -188,4 +188,14 @@
#define HCHK_DESC_LEN 128
#endif
/* ciphers used as defaults on connect */
#ifndef CONNECT_DEFAULT_CIPHERS
#define CONNECT_DEFAULT_CIPHERS NULL
#endif
/* ciphers used as defaults on listeners */
#ifndef LISTEN_DEFAULT_CIPHERS
#define LISTEN_DEFAULT_CIPHERS NULL
#endif
#endif /* _COMMON_DEFAULTS_H */

2
include/types/global.h
View File

@ -76,6 +76,8 @@ struct global {
int maxconn, hardmaxconn;
#ifdef USE_OPENSSL
int maxsslconn;
char *listen_default_ciphers;
char *connect_default_ciphers;
#endif
struct freq_ctr conn_per_sec;
int cps_lim, cps_max;

7
src/cfgparse.c
View File

@ -4313,6 +4313,9 @@ int cfg_parse_listen(const char *file, int linenum, char **args, int kwm)
#ifdef USE_OPENSSL
newsrv->use_ssl = 1;
cur_arg += 1;
if (global.connect_default_ciphers && !newsrv->ssl_ctx.ciphers)
newsrv->ssl_ctx.ciphers = strdup(global.connect_default_ciphers);
#else /* USE_OPENSSL */
Alert("parsing [%s:%d]: '%s' option not implemented.\n",
file, linenum, args[cur_arg]);
@ -4324,6 +4327,9 @@ int cfg_parse_listen(const char *file, int linenum, char **args, int kwm)
#ifdef USE_OPENSSL
newsrv->check.use_ssl = 1;
cur_arg += 1;
if (global.connect_default_ciphers && !newsrv->ssl_ctx.ciphers)
newsrv->ssl_ctx.ciphers = strdup(global.connect_default_ciphers);
#else /* USE_OPENSSL */
Alert("parsing [%s:%d]: '%s' option not implemented.\n",
file, linenum, args[cur_arg]);
@ -4340,6 +4346,7 @@ int cfg_parse_listen(const char *file, int linenum, char **args, int kwm)
goto out;
}
free(newsrv->ssl_ctx.ciphers);
newsrv->ssl_ctx.ciphers = strdup(args[cur_arg + 1]);
cur_arg += 2;

10
src/haproxy.c
View File

@ -125,8 +125,16 @@ struct global global = {
.sslcachesize = 20000,
#endif
},
#if defined (USE_OPENSSL) && defined(DEFAULT_MAXSSLCONN)
#ifdef USE_OPENSSL
#ifdef DEFAULT_MAXSSLCONN
.maxsslconn = DEFAULT_MAXSSLCONN,
#endif
#ifdef LISTEN_DEFAULT_CIPHERS
.listen_default_ciphers = LISTEN_DEFAULT_CIPHERS,
#endif
#ifdef CONNECT_DEFAULT_CIPHERS
.connect_default_ciphers = CONNECT_DEFAULT_CIPHERS,
#endif
#endif
/* others NULL OK */
};

5
src/ssl_sock.c
View File

@ -1138,6 +1138,7 @@ static int bind_parse_ciphers(char **args, int cur_arg, struct proxy *px, struct
return ERR_ALERT | ERR_FATAL;
}
free(conf->ciphers);
conf->ciphers = strdup(args[cur_arg + 1]);
return 0;
}
@ -1340,6 +1341,10 @@ static int bind_parse_ssl(char **args, int cur_arg, struct proxy *px, struct bin
struct listener *l;
conf->is_ssl = 1;
if (global.listen_default_ciphers && !conf->ciphers)
conf->ciphers = strdup(global.listen_default_ciphers);
list_for_each_entry(l, &conf->listeners, by_bind)
l->xprt = &ssl_sock;