making ssl_init_SSLLibrary() static

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

diff --git a/modules/ssl/mod_ssl.h b/modules/ssl/mod_ssl.h
index ac6a14d3d18eb8af089810213f8d97922f924c3e..b5dbabb004739dba380fb207a41a91e0dafdbfcf 100644 (file)
--- a/modules/ssl/mod_ssl.h
+++ b/modules/ssl/mod_ssl.h
@@ -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  */

diff --git a/modules/ssl/ssl_engine_init.c b/modules/ssl/ssl_engine_init.c
index ec5ffed588d78ee2a97e8aa4fc6a8042f665212c..8acacbefc5baff25519e872958ae37fd6f7cfc57 100644 (file)
--- a/modules/ssl/ssl_engine_init.c
+++ b/modules/ssl/ssl_engine_init.c
@@ -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.