Bug 1064878

+++ This bug was initially created as a clone of Bug #1057687 +++

Description of problem:
When using DHE based cipher suites, the offered DH parameters by mod_ssl are always 1024 bit sized, even if the certificate used is 2048 bit.
This makes httpd not compliant with NIST SP 800-131A when DHE cipher suite is negotiated since 1st of January this year.

Version-Release number of selected component (if applicable):
httpd-2.4.6-13.el7.x86_64
mod_ssl-2.4.6-13.el7.x86_64
nss-3.15.3-4.el7.x86_64
openssl-1.0.1e-29.el7.x86_64

How reproducible:
Always

Steps to Reproduce:
1. Generate RSA certificates that are 2048bit long
2. Generate 2048 bit DH parameters, add them to file referenced by SSLCertificateFile
3. Connect using tstclnt -d /etc/pki/nssdb/ -h localhost -p 443 -V ssl3: -o -v

Actual results:
tstclnt: SSL version 3.3 using 256-bit AES with 160-bit SHA1 MAC
tstclnt: Server Auth: 2048-bit RSA, Key Exchange: 1024-bit DHE
         Compression: NULL

Expected results:
tstclnt: SSL version 3.3 using 256-bit AES with 160-bit SHA1 MAC
tstclnt: Server Auth: 2048-bit RSA, Key Exchange: 2048-bit DHE
         Compression: NULL

(note Key Exchange in second line)

Additional info:
http://csrc.nist.gov/publications/nistpubs/800-131A/sp800-131A.pdf

Httpd should automatically select DH parameters that are at least as long as the RSA keys (see SP 800-131A and SP 800-57 Part 1).

--- Additional comment from Joe Orton on 2014-01-24 10:48:48 EST ---

This is done upstream already in 2.4.7:

http://svn.apache.org/r1542327