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

fixup naming: 

 ssl_init_ctx_* will be used for both proxy and server
 ssl_init_server_* is specific to the server


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

ssl_engine_init.c

+12 −12
Changes for ssl_engine_init.c: 12 added lines, 12 removed lines.
Original line number Diff line number Diff line
@@ -365,7 +365,7 @@ void ssl_init_Engine(server_rec *s, apr_pool_t *p) 
}

#endif



static void ssl_init_check_server(server_rec *s,

static void ssl_init_server_check(server_rec *s,

                                  apr_pool_t *p,

                                  apr_pool_t *ptemp,

                                  SSLSrvConfigRec *sc)
@@ -454,7 +454,7 @@ static SSL_CTX *ssl_init_ctx(server_rec *s, 
    return ctx;

}



static void ssl_init_session_cache_ctx(server_rec *s,

static void ssl_init_ctx_session_cache(server_rec *s,

                                       apr_pool_t *p,

                                       apr_pool_t *ptemp,

                                       SSLSrvConfigRec *sc)
@@ -494,7 +494,7 @@ static void ssl_init_ctx_callbacks(server_rec *s, 
    }

}



static void ssl_init_verify(server_rec *s,

static void ssl_init_ctx_verify(server_rec *s,

                                apr_pool_t *p,

                                apr_pool_t *ptemp,

                                SSLSrvConfigRec *sc)
@@ -573,7 +573,7 @@ static void ssl_init_verify(server_rec *s, 
    }

}



static void ssl_init_cipher_suite(server_rec *s,

static void ssl_init_ctx_cipher_suite(server_rec *s,

                                      apr_pool_t *p,

                                      apr_pool_t *ptemp,

                                      SSLSrvConfigRec *sc)
@@ -599,7 +599,7 @@ static void ssl_init_cipher_suite(server_rec *s, 
    }

}



static void ssl_init_crl(server_rec *s,

static void ssl_init_ctx_crl(server_rec *s,

                             apr_pool_t *p,

                             apr_pool_t *ptemp,

                             SSLSrvConfigRec *sc)
@@ -627,7 +627,7 @@ static void ssl_init_crl(server_rec *s, 
    }

}



static void ssl_init_cert_chain(server_rec *s,

static void ssl_init_ctx_cert_chain(server_rec *s,

                                    apr_pool_t *p,

                                    apr_pool_t *ptemp,

                                    SSLSrvConfigRec *sc)
@@ -871,21 +871,21 @@ void ssl_init_ConfigureServer(server_rec *s, 
                              apr_pool_t *ptemp,

                              SSLSrvConfigRec *sc)

{

    ssl_init_check_server(s, p, ptemp, sc);

    ssl_init_server_check(s, p, ptemp, sc);



    ssl_init_ctx(s, p, ptemp, sc);



    ssl_init_session_cache_ctx(s, p, ptemp, sc);

    ssl_init_ctx_session_cache(s, p, ptemp, sc);



    ssl_init_ctx_callbacks(s, p, ptemp, sc);



    ssl_init_verify(s, p, ptemp, sc);

    ssl_init_ctx_verify(s, p, ptemp, sc);



    ssl_init_cipher_suite(s, p, ptemp, sc);

    ssl_init_ctx_cipher_suite(s, p, ptemp, sc);



    ssl_init_crl(s, p, ptemp, sc);

    ssl_init_ctx_crl(s, p, ptemp, sc);



    ssl_init_cert_chain(s, p, ptemp, sc);

    ssl_init_ctx_cert_chain(s, p, ptemp, sc);



    ssl_init_server_certs(s, p, ptemp, sc);

}