From 29917a530323fd579142eb7590d4a2188dbb7cdb Mon Sep 17 00:00:00 2001 From: Jeff Trawick Date: Mon, 11 Nov 2002 13:16:17 +0000 Subject: [PATCH] Rearrange OpenSSL engine initialization to support RAND redirection on crypto accelerator. Submitted by: Frederic DONNAT Reviewed by: Jeff Trawick git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97482 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 4 ++++ modules/ssl/ssl_engine_init.c | 14 +++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/CHANGES b/CHANGES index a3f3c8b755..939ce60d6e 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,9 @@ Changes with Apache 2.0.44 + *) Rearrange OpenSSL engine initialization to support RAND + redirection on crypto accelerator. + [Frederic DONNAT ] + *) Always emit Vary header if mod_deflate is involved in the request. [Andre Malo ] diff --git a/modules/ssl/ssl_engine_init.c b/modules/ssl/ssl_engine_init.c index b387ccc944..7a2e74273e 100644 --- a/modules/ssl/ssl_engine_init.c +++ b/modules/ssl/ssl_engine_init.c @@ -266,6 +266,13 @@ int ssl_init_Module(apr_pool_t *p, apr_pool_t *plog, } + /* + * SSL external crypto device ("engine") support + */ +#ifdef SSL_EXPERIMENTAL_ENGINE + ssl_init_Engine(base_server, p); +#endif + ssl_init_SSLLibrary(base_server); #if APR_HAS_THREADS @@ -291,13 +298,6 @@ int ssl_init_Module(apr_pool_t *p, apr_pool_t *plog, return !OK; } - /* - * SSL external crypto device ("engine") support - */ -#ifdef SSL_EXPERIMENTAL_ENGINE - ssl_init_Engine(base_server, p); -#endif - /* * initialize the mutex handling */ -- 2.40.0