Commit c2450b75 authored by Cliff Woolley's avatar Cliff Woolley
Browse files

Make mod_ssl consistent with itself when you have a halfass install of 

openssl-engine (ie, you're missing the headers).  ssl_cmd_SSLCryptoDevice()
is thrown away by the preprocessor if you're missing the header, so the
call to it should have the same condition applied.  otherwise, mod_ssl
will fail to link.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@100970 13f79535-47bb-0310-9956-ffa450edef68
parent 05c20873

mod_ssl.c

+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 HAVE_ENGINE_INIT

#if defined(HAVE_OPENSSL_ENGINE_H) && defined(HAVE_ENGINE_INIT)

    SSL_CMD_SRV(CryptoDevice, TAKE1,

                "SSL external Crypto Device usage "

                "(`builtin', `...')")

mod_ssl.h

+1 −1
Original line number Diff line number Diff line
@@ -401,7 +401,7 @@ typedef struct { 
    void           *pTmpKeys[SSL_TMP_KEY_MAX];

    apr_hash_t     *tPublicCert;

    apr_hash_t     *tPrivateKey;

#ifdef HAVE_ENGINE_INIT

#if defined(HAVE_OPENSSL_ENGINE_H) && defined(HAVE_ENGINE_INIT)

    const char     *szCryptoDevice;

#endif

    struct {

ssl_engine_config.c

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,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 HAVE_ENGINE_INIT

#if defined(HAVE_OPENSSL_ENGINE_H) && defined(HAVE_ENGINE_INIT)

    mc->szCryptoDevice         = NULL;

#endif