21 lines
818 B
Diff
21 lines
818 B
Diff
|
|
||
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=1109119
|
||
|
|
|
||
|
|
Don't prepend !aNULL etc if PROFILE= is used with SSLCipherSuite.
|
||
|
|
|
||
|
|
--- httpd-2.4.10/modules/ssl/ssl_engine_config.c.sslciphdefault
|
||
|
|
+++ httpd-2.4.10/modules/ssl/ssl_engine_config.c
|
||
|
|
@@ -692,8 +692,10 @@ const char *ssl_cmd_SSLCipherSuite(cmd_p
|
||
|
|
SSLSrvConfigRec *sc = mySrvConfig(cmd->server);
|
||
|
|
SSLDirConfigRec *dc = (SSLDirConfigRec *)dcfg;
|
||
|
|
|
||
|
|
- /* always disable null and export ciphers */
|
||
|
|
- arg = apr_pstrcat(cmd->pool, "!aNULL:!eNULL:!EXP:", arg, NULL);
|
||
|
|
+ /* Disable null and export ciphers by default, except for PROFILE=
|
||
|
|
+ * configs where the parser doesn't cope. */
|
||
|
|
+ if (strncmp(arg, "PROFILE=", 8) != 0)
|
||
|
|
+ arg = apr_pstrcat(cmd->pool, "!aNULL:!eNULL:!EXP:", arg, NULL);
|
||
|
|
|
||
|
|
if (cmd->path) {
|
||
|
|
dc->szCipherSuite = arg;
|