mirror of
https://github.com/apache/httpd.git
synced 2025-08-08 15:02:10 +03:00
Based on list discussion between myself and Geoff, it seems prudent
to check for both the existence of the openssl/engine.h header file and some 'expected function' such as ENGINE_init() (better suggestions are welcome.) Also clear up some confusion; so long as we have ENGINE_load_builtin_engines() we should attempt to preload those. This patch protects all ENGINE-based code within the tests for the engine header and function, and changes a version test into a function test. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100104 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
@@ -270,7 +270,7 @@ int ssl_init_Module(apr_pool_t *p, apr_pool_t *plog,
|
||||
/*
|
||||
* SSL external crypto device ("engine") support
|
||||
*/
|
||||
#ifdef HAVE_ENGINE_INIT
|
||||
#if defined(HAVE_OPENSSL_ENGINE_H) && defined(HAVE_ENGINE_INIT)
|
||||
ssl_init_Engine(base_server, p);
|
||||
#endif
|
||||
|
||||
@@ -351,7 +351,7 @@ int ssl_init_Module(apr_pool_t *p, apr_pool_t *plog,
|
||||
* Support for external a Crypto Device ("engine"), usually
|
||||
* a hardware accellerator card for crypto operations.
|
||||
*/
|
||||
#ifdef HAVE_ENGINE_INIT
|
||||
#if defined(HAVE_OPENSSL_ENGINE_H) && defined(HAVE_ENGINE_INIT)
|
||||
void ssl_init_Engine(server_rec *s, apr_pool_t *p)
|
||||
{
|
||||
SSLModConfigRec *mc = myModConfig(s);
|
||||
|
Reference in New Issue
Block a user