From 828dc11281ef25b9395e4b270725bd05bb127302 Mon Sep 17 00:00:00 2001 From: "William A. Rowe Jr" Date: Tue, 31 Jul 2001 03:40:47 +0000 Subject: [PATCH] enables the use of the ssl_var_lookup functionality in the various source files in modules/ssl. The ap_hook_* functions are still not yet ported to Apache 2.0 style Submitted by: Madhusudan Mathihalli git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89819 13f79535-47bb-0310-9956-ffa450edef68 --- modules/ssl/mod_ssl.c | 3 +-- modules/ssl/ssl_engine_init.c | 15 ++++++--------- modules/ssl/ssl_engine_kernel.c | 8 -------- 3 files changed, 7 insertions(+), 19 deletions(-) diff --git a/modules/ssl/mod_ssl.c b/modules/ssl/mod_ssl.c index f8a0e8788a..e49c5971f7 100644 --- a/modules/ssl/mod_ssl.c +++ b/modules/ssl/mod_ssl.c @@ -488,6 +488,7 @@ static void ssl_register_hooks(apr_pool_t *p) ap_hook_default_port (ssl_hook_default_port, NULL,NULL, APR_HOOK_MIDDLE); ap_hook_handler (ssl_hook_Handler, NULL,NULL, APR_HOOK_MIDDLE); ap_hook_pre_config (ssl_hook_pre_config, NULL,NULL, APR_HOOK_MIDDLE); + ap_hook_fixups (ssl_hook_Fixup, NULL,NULL, APR_HOOK_MIDDLE); #if 0 /* XXX - Work in progress */ ap_hook_child_init (ssl_init_Child, NULL,NULL, APR_HOOK_MIDDLE); @@ -508,10 +509,8 @@ static void ssl_register_hooks(apr_pool_t *p) ap_hook_type_checker (ssl_hook_fixer_upper, NULL,NULL, APR_HOOK_MIDDLE); ap_hook_insert_filter (ssl_hook_insert_filter, NULL,NULL, APR_HOOK_MIDDLE); #endif -#if 0 /* XXX */ ssl_var_register(); ssl_io_register(); -#endif } module AP_MODULE_DECLARE_DATA ssl_module = { diff --git a/modules/ssl/ssl_engine_init.c b/modules/ssl/ssl_engine_init.c index 7865c09c5c..ee68a29e85 100644 --- a/modules/ssl/ssl_engine_init.c +++ b/modules/ssl/ssl_engine_init.c @@ -76,6 +76,7 @@ void ssl_init_Module(apr_pool_t *p, apr_pool_t *plog, SSLModConfigRec *mc = myModConfig(s); SSLSrvConfigRec *sc; server_rec *s2; + char *cp; /* * Let us cleanup on restarts and exists @@ -121,12 +122,10 @@ void ssl_init_Module(apr_pool_t *p, apr_pool_t *plog, * Identification */ if (mc->nInitCount == 1) { -#if 0 /* XXX */ ssl_log(s, SSL_LOG_INFO, "Server: %s, Interface: %s, Library: %s", AP_SERVER_BASEVERSION, - ssl_var_lookup(p, NULL, NULL, NULL, "SSL_VERSION_INTERFACE"), - ssl_var_lookup(p, NULL, NULL, NULL, "SSL_VERSION_LIBRARY")); -#endif + ssl_var_lookup(p, s, NULL, NULL, "SSL_VERSION_INTERFACE"), + ssl_var_lookup(p, s, NULL, NULL, "SSL_VERSION_LIBRARY")); } /* @@ -257,12 +256,10 @@ void ssl_init_Module(apr_pool_t *p, apr_pool_t *plog, * Announce mod_ssl and SSL library in HTTP Server field * as ``mod_ssl/X.X.X OpenSSL/X.X.X'' */ -#if 0 /* XXX */ - if ((cp = ssl_var_lookup(p, NULL, NULL, NULL, "SSL_VERSION_PRODUCT")) != NULL && cp[0] != NUL) + if ((cp = ssl_var_lookup(p, s, NULL, NULL, "SSL_VERSION_PRODUCT")) != NULL && cp[0] != NUL) ap_add_version_component(p, cp); - ap_add_version_component(p, ssl_var_lookup(p, NULL, NULL, NULL, "SSL_VERSION_INTERFACE")); - ap_add_version_component(p, ssl_var_lookup(p, NULL, NULL, NULL, "SSL_VERSION_LIBRARY")); -#endif + ap_add_version_component(p, ssl_var_lookup(p, s, NULL, NULL, "SSL_VERSION_INTERFACE")); + ap_add_version_component(p, ssl_var_lookup(p, s, NULL, NULL, "SSL_VERSION_LIBRARY")); return; } diff --git a/modules/ssl/ssl_engine_kernel.c b/modules/ssl/ssl_engine_kernel.c index 1357071b82..14a29fa005 100644 --- a/modules/ssl/ssl_engine_kernel.c +++ b/modules/ssl/ssl_engine_kernel.c @@ -1298,9 +1298,7 @@ int ssl_hook_Fixup(request_rec *r) if (dc->nOptions & SSL_OPT_STDENVVARS) { for (i = 0; ssl_hook_Fixup_vars[i] != NULL; i++) { var = (char *)ssl_hook_Fixup_vars[i]; -#if 0 /* XXX */ val = ssl_var_lookup(r->pool, r->server, r->connection, r, var); -#endif if (!strIsEmpty(val)) apr_table_set(e, var, val); } @@ -1310,18 +1308,14 @@ int ssl_hook_Fixup(request_rec *r) * On-demand bloat up the SSI/CGI environment with certificate data */ if (dc->nOptions & SSL_OPT_EXPORTCERTDATA) { -#if 0 /* XXX */ val = ssl_var_lookup(r->pool, r->server, r->connection, r, "SSL_SERVER_CERT"); apr_table_set(e, "SSL_SERVER_CERT", val); val = ssl_var_lookup(r->pool, r->server, r->connection, r, "SSL_CLIENT_CERT"); apr_table_set(e, "SSL_CLIENT_CERT", val); -#endif if ((sk = SSL_get_peer_cert_chain(ssl)) != NULL) { for (i = 0; i < sk_X509_num(sk); i++) { var = apr_psprintf(r->pool, "SSL_CLIENT_CERT_CHAIN_%d", i); -#if 0 /* XXX */ val = ssl_var_lookup(r->pool, r->server, r->connection, r, var); -#endif if (val != NULL) apr_table_setn(e, var, val); } @@ -1894,7 +1888,6 @@ void ssl_callback_LogTracingState(SSL *ssl, int where, int rc) * right after a finished handshake. */ if (where & SSL_CB_HANDSHAKE_DONE) { -#if 0 /* XXX */ ssl_log(s, SSL_LOG_INFO, "Connection: Client IP: %s, Protocol: %s, Cipher: %s (%s/%s bits)", ssl_var_lookup(NULL, s, c, NULL, "REMOTE_ADDR"), @@ -1902,7 +1895,6 @@ void ssl_callback_LogTracingState(SSL *ssl, int where, int rc) ssl_var_lookup(NULL, s, c, NULL, "SSL_CIPHER"), ssl_var_lookup(NULL, s, c, NULL, "SSL_CIPHER_USEKEYSIZE"), ssl_var_lookup(NULL, s, c, NULL, "SSL_CIPHER_ALGKEYSIZE")); -#endif } return; -- 2.40.0