Commit bd4308d3 authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files

  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
parent fbbe65ed
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -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
+1 −1
Original line number Diff line number Diff line
@@ -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', `...')")
+1 −14
Original line number Diff line number Diff line
@@ -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 {
+2 −2
Original line number Diff line number Diff line
@@ -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)
+2 −2
Original line number Diff line number Diff line
@@ -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);
Loading