Commit 2727b7a7 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Merge r1679428, r1679432 from trunk: 

Conform to RFC 7525, with additional suggestion to drop RSA Kx ciphers

Document RFC 7525 changes
Submitted by: wrowe
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1679987 13f79535-47bb-0310-9956-ffa450edef68
parent 431e447c

CHANGES

+6 −0
Changes for CHANGES: 6 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -12,6 +12,12 @@ Changes with Apache 2.4.13 
     calls r:wsupgrade() can cause a child process crash. 

     [Edward Lu <Chaosed0 gmail.com>]



  *) In alignment with RFC 7525, the default recommended SSLCipherSuite

     and SSLProxyCipherSuite now exclude RC4 as well as MD5. Also, the

     default recommended SSLProtocol and SSLProxyProtocol directives now

     excludes SSLv3. Existing configurations must be adjusted by the

     administrator. [William Rowe]



  *) mod_ssl: Add support for extracting subjectAltName entries of type

     rfc822Name and dNSName into SSL_{CLIENT,SERVER}_SAN_{Email,DNS}_n

     environment variables. Also addresses PR 57207. [Kaspar Brand]

STATUS

+0 −7
Changes for STATUS: 0 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -105,13 +105,6 @@ RELEASE SHOWSTOPPERS: 
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

  [ start all new proposals below, under PATCHES PROPOSED. ]



  *) Propose a more modern Cipher and Protocol list, honor server cipher

     priority and add explanations relative to RFC 7525 guidance.

                  http://svn.apache.org/r1679428

                  http://svn.apache.org/r1679432 [CHANGES]

     2.4.x patch: trunk works (modulo CHANGES)

     +1: wrowe, ylavic, jim



  *) Always prepend "!aNULL:!eNULL:" to SSL_DEFAULT_CIPHER_LIST (default for

     SSL[Proxy]CipherSuite) since we support OpenSSL versions where this was

     not yet included by default (follow up to merge r1542327 in 2.4.7).

docs/conf/extra/httpd-ssl.conf.in

+32 −15
Changes for docs/conf/extra/httpd-ssl.conf.in: 32 added lines, 15 removed lines.
Original line number Diff line number Diff line
@@ -43,22 +43,39 @@ Listen @@SSLPort@@ 
##



#   SSL Cipher Suite:

#   List the ciphers that the client is permitted to negotiate.

#   See the mod_ssl documentation for a complete list.

SSLCipherSuite HIGH:MEDIUM:!aNULL:!MD5

#   List the ciphers that the client is permitted to negotiate,

#   and that httpd will negotiate as the client of a proxied server.

#   See the OpenSSL documentation for a complete list of ciphers, and

#   ensure these follow appropriate best practices for this deployment.

SSLCipherSuite HIGH:MEDIUM:!MD5:!RC4

SSLProxyCipherSuite HIGH:MEDIUM:!MD5:!RC4



#   Speed-optimized SSL Cipher configuration:

#   If speed is your main concern (on busy HTTPS servers e.g.),

#   you might want to force clients to specific, performance

#   optimized ciphers. In this case, prepend those ciphers

#   to the SSLCipherSuite list, and enable SSLHonorCipherOrder.

#   Caveat: by giving precedence to RC4-SHA and AES128-SHA

#   (as in the example below), most connections will no longer

#   have perfect forward secrecy - if the server's key is

#   compromised, captures of past or future traffic must be

#   considered compromised, too.

#SSLCipherSuite RC4-SHA:AES128-SHA:HIGH:MEDIUM:!aNULL:!MD5

#SSLHonorCipherOrder on 

#  By the end of 2016, only TLSv1.2 ciphers should remain in use.

#  Older ciphers should be disallowed as soon as possible, while the

#  kRSA ciphers do not offer forward secrecy.  These changes inhibit

#  older clients (such as IE6 SP2 or IE8 on Windows XP, or other legacy

#  non-browser tooling) from successfully connecting.  

#

#  To restrict mod_ssl to use only TLSv1.2 ciphers, and disable

#  those protocols which do not support forward secrecy, replace

#  the SSLCipherSuite and SSLProxyCipherSuite directives above with

#  the following two directives, as soon as practical.

# SSLCipherSuite HIGH:MEDIUM:!SSLv3:!kRSA

# SSLProxyCipherSuite HIGH:MEDIUM:!SSLv3:!kRSA



#   User agents such as web browsers are not configured for the user's

#   own preference of either security or performance, therefore this

#   must be the prerogative of the web server administrator who manages

#   cpu load versus confidentiality, so enforce the server's cipher order.

SSLHonorCipherOrder on 



#   SSL Protocol support:

#   List the protocol versions which clients are allowed to connect with.

#   Disable SSLv3 by default (cf. RFC 7525 3.1.1).  TLSv1 (1.0) should be

#   disabled as quickly as practical.  By the end of 2016, only the TLSv1.2

#   protocol or later should remain in use.

SSLProtocol all -SSLv3

SSLProxyProtocol all -SSLv3



#   Pass Phrase Dialog:

#   Configure the pass phrase gathering process.