Skip to content
Commit 058a25cd authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Merge r834378, r835046, r1040304, r1040373, r1090645, r1294306, r1509872,...

Merge r834378, r835046, r1040304, r1040373, r1090645, r1294306, r1509872, r1308862, r1509875 from trunk:

enable support for ECC keys and ECDH ciphers.  Tested against
OpenSSL 1.0.0b3.  [Vipul Gupta vipul.gupta sun.com, Sander Temme]


* Use correct #ifndef's to compile again on openssl 0.9.8 and fix compiler
  warnings.

Noted by: sf


Removed unused var.


Stop warning, init should be an int.


Remove unused variable


Initialize EC temporary key on server startup, as for DH and
RSA. This fixes a race condition that could lead to a crash with threaded
MPMs.


Mention ECC support

Submitted by: sctemme, rpluem, fuankg, drh, sf, sf, sf, jim, sf
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1540727 13f79535-47bb-0310-9956-ffa450edef68
parent 1ec5de16
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment