Commit a99886e5 authored by Doug MacEachern's avatar Doug MacEachern
Browse files

making ssl_init_SSLLibrary() static 


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

mod_ssl.h

+0 −2
Changes for mod_ssl.h: 0 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -648,7 +648,6 @@ const char *ssl_cmd_SSLProxyMachineCertificateFile(cmd_parms *, char *, char *) 


/*  module initialization  */

int          ssl_init_Module(apr_pool_t *, apr_pool_t *, apr_pool_t *, server_rec *);

void         ssl_init_SSLLibrary(void);

void         ssl_init_Engine(server_rec *, apr_pool_t *);

void         ssl_init_TmpKeysHandle(int, server_rec *, apr_pool_t *);

void         ssl_init_ConfigureServer(server_rec *, apr_pool_t *, SSLSrvConfigRec *);
@@ -656,7 +655,6 @@ void ssl_init_CheckServers(server_rec *, apr_pool_t *); 
STACK_OF(X509_NAME) 

            *ssl_init_FindCAList(server_rec *, apr_pool_t *, const char *, const char *);

void         ssl_init_Child(apr_pool_t *, server_rec *);

apr_status_t ssl_init_ChildKill(void *data);

apr_status_t ssl_init_ModuleKill(void *data);



/*  Apache API hooks  */

ssl_engine_init.c

+16 −15
Changes for ssl_engine_init.c: 16 added lines, 15 removed lines.
Original line number Diff line number Diff line
@@ -105,6 +105,21 @@ static void ssl_add_version_components(apr_pool_t *p, 
            vals[2]); /* SSL_VERSION_LIBRARY */

}





/*

 *  Initialize SSL library

 */

static void ssl_init_SSLLibrary(server_rec *s)

{

    ssl_log(s, SSL_LOG_INFO,

            "Init: Initializing %s library", SSL_LIBRARY_NAME);



    CRYPTO_malloc_init();

    SSL_load_error_strings();

    SSL_library_init();

    X509V3_add_standard_extensions();

}



/*

 *  Per-module initialization

 */
@@ -167,10 +182,7 @@ int ssl_init_Module(apr_pool_t *p, apr_pool_t *plog, 
        ssl_log_open(base_server, s, p);

    }



    ssl_log(base_server, SSL_LOG_INFO,

            "Init: Initializing %s library", SSL_LIBRARY_NAME);



    ssl_init_SSLLibrary();

    ssl_init_SSLLibrary(base_server);



#if APR_HAS_THREADS

    ssl_util_thread_setup(base_server, p);
@@ -262,17 +274,6 @@ int ssl_init_Module(apr_pool_t *p, apr_pool_t *plog, 
    return OK;

}



/*

 *  Initialize SSL library (also already needed for the pass phrase dialog)

 */

void ssl_init_SSLLibrary(void)

{

    CRYPTO_malloc_init();

    SSL_load_error_strings();

    SSL_library_init();

    X509V3_add_standard_extensions();

}



/*

 * Support for external a Crypto Device ("engine"), usually

 * a hardware accellerator card for crypto operations.