From: William A. Rowe Jr <wrowe@apache.org>
Date: Mon, 19 May 2003 14:48:47 +0000 (+0000)
Subject:   Roll away the SSL_EXPERIMENTAL_ENGINE test in favor of testing for the
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=94032ecd28af6b1bf7eb1955fa07b3c4c7135f14;p=thirdparty%2Fapache%2Fhttpd.git

  Roll away the SSL_EXPERIMENTAL_ENGINE test in favor of testing for the
  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/modules/ssl@99919 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/config.m4 b/config.m4
index e56c48dc5ca..16ea75b2833 100644
--- a/config.m4
+++ b/config.m4
@@ -79,6 +79,7 @@ APACHE_MODULE(ssl, [SSL/TLS support (mod_ssl)], $ssl_objs, , no, [
     APACHE_CHECK_SSL_TOOLKIT
     AC_CHECK_FUNCS(SSL_set_state)
     AC_CHECK_FUNCS(SSL_set_cert_store)
+    AC_CHECK_FUNCS(ENGINE_init)
 ])
 
 dnl #  end of module specific part
diff --git a/mod_ssl.c b/mod_ssl.c
index 9195ee65fc8..e4dbef7218c 100644
--- a/mod_ssl.c
+++ b/mod_ssl.c
@@ -116,7 +116,7 @@ static const command_rec ssl_config_cmds[] = {
     SSL_CMD_SRV(SessionCache, TAKE1,
                 "SSL Session Cache storage "
                 "(`none', `dbm:/path/to/file')")
-#ifdef SSL_EXPERIMENTAL_ENGINE
+#ifdef HAVE_ENGINE_INIT
     SSL_CMD_SRV(CryptoDevice, TAKE1,
                 "SSL external Crypto Device usage "
                 "(`builtin', `...')")
diff --git a/mod_ssl.h b/mod_ssl.h
index 3f865d18a49..971a012dc12 100644
--- a/mod_ssl.h
+++ b/mod_ssl.h
@@ -64,19 +64,6 @@
 #ifndef __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...
  */
@@ -414,7 +401,7 @@ typedef struct {
     void           *pTmpKeys[SSL_TMP_KEY_MAX];
     apr_hash_t     *tPublicCert;
     apr_hash_t     *tPrivateKey;
-#ifdef SSL_EXPERIMENTAL_ENGINE
+#ifdef HAVE_ENGINE_INIT
     char           *szCryptoDevice;
 #endif
     struct {
diff --git a/ssl_engine_config.c b/ssl_engine_config.c
index af2f54aa4b8..9a55d17b26e 100644
--- a/ssl_engine_config.c
+++ b/ssl_engine_config.c
@@ -108,7 +108,7 @@ SSLModConfigRec *ssl_config_global_create(server_rec *s)
     mc->tVHostKeys             = apr_hash_make(pool);
     mc->tPrivateKey            = apr_hash_make(pool);
     mc->tPublicCert            = apr_hash_make(pool);
-#ifdef SSL_EXPERIMENTAL_ENGINE
+#ifdef HAVE_ENGINE_INIT
     mc->szCryptoDevice         = NULL;
 #endif
 
@@ -510,7 +510,7 @@ const char *ssl_cmd_SSLPassPhraseDialog(cmd_parms *cmd,
     return NULL;
 }
 
-#ifdef SSL_EXPERIMENTAL_ENGINE
+#ifdef HAVE_ENGINE_INIT
 const char *ssl_cmd_SSLCryptoDevice(cmd_parms *cmd,
                                     void *dcfg,
                                     const char *arg)
diff --git a/ssl_engine_init.c b/ssl_engine_init.c
index ff229cdb31a..e2f49095939 100644
--- a/ssl_engine_init.c
+++ b/ssl_engine_init.c
@@ -270,7 +270,7 @@ int ssl_init_Module(apr_pool_t *p, apr_pool_t *plog,
     /*
      * SSL external crypto device ("engine") support
      */
-#ifdef SSL_EXPERIMENTAL_ENGINE
+#ifdef 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 SSL_EXPERIMENTAL_ENGINE
+#ifdef HAVE_ENGINE_INIT
 void ssl_init_Engine(server_rec *s, apr_pool_t *p)
 {
     SSLModConfigRec *mc = myModConfig(s);
diff --git a/ssl_toolkit_compat.h b/ssl_toolkit_compat.h
index 8cd69e6f698..cba8de88d36 100644
--- a/ssl_toolkit_compat.h
+++ b/ssl_toolkit_compat.h
@@ -66,7 +66,7 @@
 #include <openssl/evp.h>
 #include <openssl/rand.h>
 #include <openssl/x509v3.h>
-#ifdef SSL_EXPERIMENTAL_ENGINE
+#ifdef HAVE_ENGINE_INIT
 #include <openssl/engine.h>
 #endif