]> git.ipfire.org Git - thirdparty/apache/httpd.git/commit
Merge r834378, r835046, r1040304, r1040373, r1090645, r1294306, r1509872, r1308862...
authorJim Jagielski <jim@apache.org>
Mon, 11 Nov 2013 14:00:57 +0000 (14:00 +0000)
committerJim Jagielski <jim@apache.org>
Mon, 11 Nov 2013 14:00:57 +0000 (14:00 +0000)
commit47fbe76c32221a8fa502a896b7a0ab281008c31c
treea9ff7158198c576e5054efc763e72e16c481be93
parent3de6464f1da8c8837812fe7f9ea8ba7aca95ea6c
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
CHANGES
docs/conf/extra/httpd-ssl.conf.in
docs/manual/mod/mod_ssl.xml
modules/ssl/mod_ssl.c
modules/ssl/ssl_engine_init.c
modules/ssl/ssl_engine_kernel.c
modules/ssl/ssl_private.h
modules/ssl/ssl_toolkit_compat.h
modules/ssl/ssl_util.c