]> granicus.if.org Git - apache/commit
merge r1702643 from trunk
authorKaspar Brand <kbrand@apache.org>
Wed, 30 Sep 2015 11:42:54 +0000 (11:42 +0000)
committerKaspar Brand <kbrand@apache.org>
Wed, 30 Sep 2015 11:42:54 +0000 (11:42 +0000)
commit181e083ddb30da04dd59e17d6fdfb5228c2b7af0
tree80fb301c53c5996a6fea62e097e7abbddcd4052b
parent5e6194b6f402334299f25e76af8b743c1449b99b
merge r1702643 from trunk

Append :!aNULL:!eNULL:!EXP to the cipher string settings,
instead of prepending !aNULL:!eNULL:!EXP: (as was the case in 2.4.7
and later). Enables support for configuring the SUITEB* cipher
strings introduced in OpenSSL 1.0.2. PR 58213.

Apply the same treatment to the "SSLOpenSSLConfCmd CipherString ..." directive.

Proposed by: kbrand
Reviewed by: ylavic, jorton

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1706007 13f79535-47bb-0310-9956-ffa450edef68
CHANGES
docs/manual/mod/mod_ssl.xml
modules/ssl/ssl_engine_config.c
modules/ssl/ssl_engine_init.c