www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

Roll away the SSL_EXPERIMENTAL_ENGINE test in favor of testing for the

Browse Source 
ENGINE_init() function in config.m4, and rely on HAVE_ENGINE_INIT instead.

Reviewed by: Ben Laurie (concept)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@99919 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
William A. Rowe Jr
2003-05-19 14:48:47 +00:00
parent aab043443e
commit a5708f15e6
6 changed files with 8 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
modules/ssl/config.m4
View File

@@ -79,6 +79,7 @@ APACHE_MODULE(ssl, [SSL/TLS support (mod_ssl)], $ssl_objs, , no, [
APACHE_CHECK_SSL_TOOLKIT APACHE_CHECK_SSL_TOOLKIT
AC_CHECK_FUNCS(SSL_set_state) AC_CHECK_FUNCS(SSL_set_state)
AC_CHECK_FUNCS(SSL_set_cert_store) AC_CHECK_FUNCS(SSL_set_cert_store)
AC_CHECK_FUNCS(ENGINE_init)
]) ])
dnl # end of module specific part dnl # end of module specific part

2
modules/ssl/mod_ssl.c
View File

@@ -116,7 +116,7 @@ static const command_rec ssl_config_cmds[] = {
SSL_CMD_SRV(SessionCache, TAKE1, SSL_CMD_SRV(SessionCache, TAKE1,
"SSL Session Cache storage " "SSL Session Cache storage "
"(`none', `dbm:/path/to/file')") "(`none', `dbm:/path/to/file')")
#ifdef SSL_EXPERIMENTAL_ENGINE #ifdef HAVE_ENGINE_INIT
SSL_CMD_SRV(CryptoDevice, TAKE1, SSL_CMD_SRV(CryptoDevice, TAKE1,
"SSL external Crypto Device usage " "SSL external Crypto Device usage "
"(`builtin', `...')") "(`builtin', `...')")

15
modules/ssl/mod_ssl.h
View File

@@ -64,19 +64,6 @@
#ifndef __MOD_SSL_H__ #ifndef __MOD_SSL_H__
#define __MOD_SSL_H__ #define __MOD_SSL_H__
/*
* Optionally enable the experimental stuff, but allow the user to
* override the decision which experimental parts are included by using
* CFLAGS="-DSSL_EXPERIMENTAL_xxxx_IGNORE".
*/
#ifdef SSL_EXPERIMENTAL
#ifdef SSL_ENGINE
#ifndef SSL_EXPERIMENTAL_ENGINE_IGNORE
#define SSL_EXPERIMENTAL_ENGINE
#endif
#endif
#endif /* SSL_EXPERIMENTAL */
/* /*
* Power up our brain... * Power up our brain...
*/ */
@@ -414,7 +401,7 @@ typedef struct {
void *pTmpKeys[SSL_TMP_KEY_MAX]; void *pTmpKeys[SSL_TMP_KEY_MAX];
apr_hash_t *tPublicCert; apr_hash_t *tPublicCert;
apr_hash_t *tPrivateKey; apr_hash_t *tPrivateKey;
#ifdef SSL_EXPERIMENTAL_ENGINE #ifdef HAVE_ENGINE_INIT
char *szCryptoDevice; char *szCryptoDevice;
#endif #endif
struct { struct {

4
modules/ssl/ssl_engine_config.c
View File

@@ -108,7 +108,7 @@ SSLModConfigRec *ssl_config_global_create(server_rec *s)
mc->tVHostKeys = apr_hash_make(pool); mc->tVHostKeys = apr_hash_make(pool);
mc->tPrivateKey = apr_hash_make(pool); mc->tPrivateKey = apr_hash_make(pool);
mc->tPublicCert = apr_hash_make(pool); mc->tPublicCert = apr_hash_make(pool);
#ifdef SSL_EXPERIMENTAL_ENGINE #ifdef HAVE_ENGINE_INIT
mc->szCryptoDevice = NULL; mc->szCryptoDevice = NULL;
#endif #endif
@@ -510,7 +510,7 @@ const char *ssl_cmd_SSLPassPhraseDialog(cmd_parms *cmd,
return NULL; return NULL;
} }
#ifdef SSL_EXPERIMENTAL_ENGINE #ifdef HAVE_ENGINE_INIT
const char *ssl_cmd_SSLCryptoDevice(cmd_parms *cmd, const char *ssl_cmd_SSLCryptoDevice(cmd_parms *cmd,
void *dcfg, void *dcfg,
const char *arg) const char *arg)

4
modules/ssl/ssl_engine_init.c
View File

@@ -270,7 +270,7 @@ int ssl_init_Module(apr_pool_t *p, apr_pool_t *plog,
/* /*
* SSL external crypto device ("engine") support * SSL external crypto device ("engine") support
*/ */
#ifdef SSL_EXPERIMENTAL_ENGINE #ifdef HAVE_ENGINE_INIT
ssl_init_Engine(base_server, p); ssl_init_Engine(base_server, p);
#endif #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 * Support for external a Crypto Device ("engine"), usually
* a hardware accellerator card for crypto operations. * a hardware accellerator card for crypto operations.
*/ */
#ifdef SSL_EXPERIMENTAL_ENGINE #ifdef HAVE_ENGINE_INIT
void ssl_init_Engine(server_rec *s, apr_pool_t *p) void ssl_init_Engine(server_rec *s, apr_pool_t *p)
{ {
SSLModConfigRec *mc = myModConfig(s); SSLModConfigRec *mc = myModConfig(s);

2
modules/ssl/ssl_toolkit_compat.h
View File

@@ -66,7 +66,7 @@
#include <openssl/evp.h> #include <openssl/evp.h>
#include <openssl/rand.h> #include <openssl/rand.h>
#include <openssl/x509v3.h> #include <openssl/x509v3.h>
#ifdef SSL_EXPERIMENTAL_ENGINE #ifdef HAVE_ENGINE_INIT
#include <openssl/engine.h> #include <openssl/engine.h>
#endif #endif