diff options
| author | Jim Jagielski <jim@apache.org> | 2015-05-13 12:48:13 +0000 |
|---|---|---|
| committer | Jim Jagielski <jim@apache.org> | 2015-05-13 12:48:13 +0000 |
| commit | 429a4ba7e5239f9b8b9f97a1d2b18ada35c4dd9a (patch) | |
| tree | b3945f10358f541e44bf8f4cb4aba8d37065f45a /acinclude.m4 | |
| parent | a7324d62a63a889f61843b4783ffccefcaf9045e (diff) | |
| download | httpd-429a4ba7e5239f9b8b9f97a1d2b18ada35c4dd9a.tar.gz | |
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
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 6fa6382613..d94f8aae6f 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -576,7 +576,7 @@ AC_DEFUN(APACHE_CHECK_OPENSSL,[ liberrors="" AC_CHECK_HEADERS([openssl/engine.h]) AC_CHECK_FUNCS([SSLeay_version SSL_CTX_new], [], [liberrors="yes"]) - AC_CHECK_FUNCS([ENGINE_init ENGINE_load_builtin_engines]) + AC_CHECK_FUNCS([ENGINE_init ENGINE_load_builtin_engines RAND_egd]) if test "x$liberrors" != "x"; then AC_MSG_WARN([OpenSSL libraries are unusable]) fi |