28 lines
1.1 KiB
Diff
28 lines
1.1 KiB
Diff
--- modules/ssl/ssl_engine_init.c.orig 2014-07-15 18:48:00.382044224 +0200
|
|
+++ modules/ssl/ssl_engine_init.c 2014-07-15 18:48:35.452335112 +0200
|
|
@@ -275,9 +275,11 @@ apr_status_t ssl_init_Engine(server_rec
|
|
return ssl_die(s);
|
|
}
|
|
|
|
+#ifdef ENGINE_CTRL_CHIL_SET_FORKCHECK
|
|
if (strEQ(mc->szCryptoDevice, "chil")) {
|
|
ENGINE_ctrl(e, ENGINE_CTRL_CHIL_SET_FORKCHECK, 1, 0, 0);
|
|
}
|
|
+#endif
|
|
|
|
if (!ENGINE_set_default(e, ENGINE_METHOD_ALL)) {
|
|
ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s, APLOGNO(01889)
|
|
--- modules/ssl/ssl_engine_rand.c.orig 2014-07-15 18:49:13.853653603 +0200
|
|
+++ modules/ssl/ssl_engine_rand.c 2014-07-15 18:49:49.180946663 +0200
|
|
@@ -86,9 +86,11 @@ int ssl_rand_seed(server_rec *s, apr_poo
|
|
* seed in contents provided by the external
|
|
* Entropy Gathering Daemon (EGD)
|
|
*/
|
|
+#ifdef HAVE_SSL_RAND_EGD
|
|
if ((n = RAND_egd(pRandSeed->cpPath)) == -1)
|
|
continue;
|
|
nDone += n;
|
|
+#endif
|
|
}
|
|
else if (pRandSeed->nSrc == SSL_RSSRC_BUILTIN) {
|
|
struct {
|