]> git.ipfire.org Git - thirdparty/apache/httpd.git/commit
Merge r1674542, r1675410, r1676842 from trunk:
authorJim Jagielski <jim@apache.org>
Wed, 13 May 2015 12:48:13 +0000 (12:48 +0000)
committerJim Jagielski <jim@apache.org>
Wed, 13 May 2015 12:48:13 +0000 (12:48 +0000)
commit429a4ba7e5239f9b8b9f97a1d2b18ada35c4dd9a
treeb3945f10358f541e44bf8f4cb4aba8d37065f45a
parenta7324d62a63a889f61843b4783ffccefcaf9045e
Merge r1674542, r1675410, r1676842 from trunk:

mod_ssl: Check for RAND_egd() at configure time and only use it if present.
Fixes the build with LibreSSL which does not provide this function.

Submitted by: Bernard Spil <pil.oss gmail com>, stsp
Committed by: stsp

mod_ssl: Make the config parser complain if SSLRandomSeed specifies
the Entropy Gathering Daemon (EGD) as source while the underlying
SSL library does not support EGD (e.g. in case of LibreSSL).

Suggested and reviewed by: kbrand

Follow up to r1674542 and r1675410: CHANGES entry.
Submitted by: stsp, ylavic
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1679199 13f79535-47bb-0310-9956-ffa450edef68
CHANGES
STATUS
acinclude.m4
modules/ssl/ssl_engine_config.c
modules/ssl/ssl_engine_rand.c