www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-07 04:02:58 +03:00
Code Activity

Change mostly all old module structure hooks and EAPI hooks to

Browse Source 
ap_hook_xxx equivalents. More work has to be done here to clean all this
up and reduce to a minimum...


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89020 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Ralf S. Engelschall
2001-05-05 16:55:28 +00:00
parent 11b82d3226
commit a0f48e90fa
8 changed files with 257 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/ssl/README
View File

@@ -156,3 +156,10 @@
o The DBM based session cache is now based on APR's DBM API only. o The DBM based session cache is now based on APR's DBM API only.
TODO
o Whether to unregister and how to unregister?
ssl_var_unregister();
ssl_ext_unregister();
ssl_io_unregister();

327
modules/ssl/mod_ssl.c
View File

@@ -59,121 +59,125 @@
#include "mod_ssl.h" #include "mod_ssl.h"
/* _________________________________________________________________
**
** Apache API glue structures
** _________________________________________________________________
*/
/* /*
* the table of configuration directives we provide * the table of configuration directives we provide
*/ */
#define SSL_CMD_ALL(name, args, desc) \
AP_INIT_##args("SSL"#name, ssl_cmd_SSL##name, NULL, RSRC_CONF|OR_AUTHCFG, desc),
#define SSL_CMD_SRV(name, args, desc) \
AP_INIT_##args("SSL"#name, ssl_cmd_SSL##name, NULL, RSRC_CONF, desc),
#define SSL_CMD_DIR(name, type, args, desc) \
AP_INIT_##args("SSL"#name, ssl_cmd_SSL##name, NULL, OR_##type, desc),
#define AP_END_CMD { NULL }
static const command_rec ssl_config_cmds[] = { static const command_rec ssl_config_cmds[] = {
/* /*
* Global (main-server) context configuration directives * Global (main-server) context configuration directives
*/ */
AP_SRV_CMD(Mutex, TAKE1, SSL_CMD_SRV(Mutex, TAKE1,
"SSL lock for handling internal mutual exclusions " "SSL lock for handling internal mutual exclusions "
"(`none', `file:/path/to/file')") "(`none', `file:/path/to/file')")
AP_SRV_CMD(PassPhraseDialog, TAKE1, SSL_CMD_SRV(PassPhraseDialog, TAKE1,
"SSL dialog mechanism for the pass phrase query " "SSL dialog mechanism for the pass phrase query "
"(`builtin', `exec:/path/to/program')") "(`builtin', `exec:/path/to/program')")
AP_SRV_CMD(SessionCache, TAKE1, SSL_CMD_SRV(SessionCache, TAKE1,
"SSL Session Cache storage " "SSL Session Cache storage "
"(`none', `dbm:/path/to/file')") "(`none', `dbm:/path/to/file')")
#ifdef SSL_EXPERIMENTAL_ENGINE #ifdef SSL_EXPERIMENTAL_ENGINE
AP_SRV_CMD(CryptoDevice, TAKE1, SSL_CMD_SRV(CryptoDevice, TAKE1,
"SSL external Crypto Device usage " "SSL external Crypto Device usage "
"(`builtin', `...')") "(`builtin', `...')")
#endif #endif
AP_SRV_CMD(RandomSeed, TAKE23, SSL_CMD_SRV(RandomSeed, TAKE23,
"SSL Pseudo Random Number Generator (PRNG) seeding source " "SSL Pseudo Random Number Generator (PRNG) seeding source "
"(`startup|connect builtin|file:/path|exec:/path [bytes]')") "(`startup|connect builtin|file:/path|exec:/path [bytes]')")
/* /*
* Per-server context configuration directives * Per-server context configuration directives
*/ */
AP_SRV_CMD(Engine, FLAG, SSL_CMD_SRV(Engine, FLAG,
"SSL switch for the protocol engine " "SSL switch for the protocol engine "
"(`on', `off')") "(`on', `off')")
AP_ALL_CMD(CipherSuite, TAKE1, SSL_CMD_ALL(CipherSuite, TAKE1,
"Colon-delimited list of permitted SSL Ciphers " "Colon-delimited list of permitted SSL Ciphers "
"(`XXX:...:XXX' - see manual)") "(`XXX:...:XXX' - see manual)")
AP_SRV_CMD(CertificateFile, TAKE1, SSL_CMD_SRV(CertificateFile, TAKE1,
"SSL Server Certificate file " "SSL Server Certificate file "
"(`/path/to/file' - PEM or DER encoded)") "(`/path/to/file' - PEM or DER encoded)")
AP_SRV_CMD(CertificateKeyFile, TAKE1, SSL_CMD_SRV(CertificateKeyFile, TAKE1,
"SSL Server Private Key file " "SSL Server Private Key file "
"(`/path/to/file' - PEM or DER encoded)") "(`/path/to/file' - PEM or DER encoded)")
AP_SRV_CMD(CertificateChainFile, TAKE1, SSL_CMD_SRV(CertificateChainFile, TAKE1,
"SSL Server CA Certificate Chain file " "SSL Server CA Certificate Chain file "
"(`/path/to/file' - PEM encoded)") "(`/path/to/file' - PEM encoded)")
#ifdef SSL_EXPERIMENTAL_PERDIRCA #ifdef SSL_EXPERIMENTAL_PERDIRCA
AP_ALL_CMD(CACertificatePath, TAKE1, SSL_CMD_ALL(CACertificatePath, TAKE1,
"SSL CA Certificate path " "SSL CA Certificate path "
"(`/path/to/dir' - contains PEM encoded files)") "(`/path/to/dir' - contains PEM encoded files)")
AP_ALL_CMD(CACertificateFile, TAKE1, SSL_CMD_ALL(CACertificateFile, TAKE1,
"SSL CA Certificate file " "SSL CA Certificate file "
"(`/path/to/file' - PEM encoded)") "(`/path/to/file' - PEM encoded)")
#else #else
AP_SRV_CMD(CACertificatePath, TAKE1, SSL_CMD_SRV(CACertificatePath, TAKE1,
"SSL CA Certificate path " "SSL CA Certificate path "
"(`/path/to/dir' - contains PEM encoded files)") "(`/path/to/dir' - contains PEM encoded files)")
AP_SRV_CMD(CACertificateFile, TAKE1, SSL_CMD_SRV(CACertificateFile, TAKE1,
"SSL CA Certificate file " "SSL CA Certificate file "
"(`/path/to/file' - PEM encoded)") "(`/path/to/file' - PEM encoded)")
#endif #endif
AP_SRV_CMD(CARevocationPath, TAKE1, SSL_CMD_SRV(CARevocationPath, TAKE1,
"SSL CA Certificate Revocation List (CRL) path " "SSL CA Certificate Revocation List (CRL) path "
"(`/path/to/dir' - contains PEM encoded files)") "(`/path/to/dir' - contains PEM encoded files)")
AP_SRV_CMD(CARevocationFile, TAKE1, SSL_CMD_SRV(CARevocationFile, TAKE1,
"SSL CA Certificate Revocation List (CRL) file " "SSL CA Certificate Revocation List (CRL) file "
"(`/path/to/file' - PEM encoded)") "(`/path/to/file' - PEM encoded)")
AP_ALL_CMD(VerifyClient, TAKE1, SSL_CMD_ALL(VerifyClient, TAKE1,
"SSL Client verify type " "SSL Client verify type "
"(`none', `optional', `require', `optional_no_ca')") "(`none', `optional', `require', `optional_no_ca')")
AP_ALL_CMD(VerifyDepth, TAKE1, SSL_CMD_ALL(VerifyDepth, TAKE1,
"SSL Client verify depth " "SSL Client verify depth "
"(`N' - number of intermediate certificates)") "(`N' - number of intermediate certificates)")
AP_SRV_CMD(SessionCacheTimeout, TAKE1, SSL_CMD_SRV(SessionCacheTimeout, TAKE1,
"SSL Session Cache object lifetime " "SSL Session Cache object lifetime "
"(`N' - number of seconds)") "(`N' - number of seconds)")
AP_SRV_CMD(Log, TAKE1, SSL_CMD_SRV(Log, TAKE1,
"SSL logfile for SSL-related messages " "SSL logfile for SSL-related messages "
"(`/path/to/file', `|/path/to/program')") "(`/path/to/file', `|/path/to/program')")
AP_SRV_CMD(LogLevel, TAKE1, SSL_CMD_SRV(LogLevel, TAKE1,
"SSL logfile verbosity level " "SSL logfile verbosity level "
"(`none', `error', `warn', `info', `debug')") "(`none', `error', `warn', `info', `debug')")
AP_SRV_CMD(Protocol, RAW_ARGS, SSL_CMD_SRV(Protocol, RAW_ARGS,
"Enable or disable various SSL protocols" "Enable or disable various SSL protocols"
"(`[+-][SSLv2|SSLv3|TLSv1] ...' - see manual)") "(`[+-][SSLv2|SSLv3|TLSv1] ...' - see manual)")
#ifdef SSL_EXPERIMENTAL_PROXY #ifdef SSL_EXPERIMENTAL_PROXY
/* /*
* Proxy configuration for remote SSL connections * Proxy configuration for remote SSL connections
*/ */
AP_SRV_CMD(ProxyProtocol, RAW_ARGS, SSL_CMD_SRV(ProxyProtocol, RAW_ARGS,
"SSL Proxy: enable or disable SSL protocol flavors " "SSL Proxy: enable or disable SSL protocol flavors "
"(`[+-][SSLv2|SSLv3|TLSv1] ...' - see manual)") "(`[+-][SSLv2|SSLv3|TLSv1] ...' - see manual)")
AP_SRV_CMD(ProxyCipherSuite, TAKE1, SSL_CMD_SRV(ProxyCipherSuite, TAKE1,
"SSL Proxy: colon-delimited list of permitted SSL ciphers " "SSL Proxy: colon-delimited list of permitted SSL ciphers "
"(`XXX:...:XXX' - see manual)") "(`XXX:...:XXX' - see manual)")
AP_SRV_CMD(ProxyVerify, FLAG, SSL_CMD_SRV(ProxyVerify, FLAG,
"SSL Proxy: whether to verify the remote certificate " "SSL Proxy: whether to verify the remote certificate "
"(`on' or `off')") "(`on' or `off')")
AP_SRV_CMD(ProxyVerifyDepth, TAKE1, SSL_CMD_SRV(ProxyVerifyDepth, TAKE1,
"SSL Proxy: maximum certificate verification depth " "SSL Proxy: maximum certificate verification depth "
"(`N' - number of intermediate certificates)") "(`N' - number of intermediate certificates)")
AP_SRV_CMD(ProxyCACertificateFile, TAKE1, SSL_CMD_SRV(ProxyCACertificateFile, TAKE1,
"SSL Proxy: file containing server certificates " "SSL Proxy: file containing server certificates "
"(`/path/to/file' - PEM encoded certificates)") "(`/path/to/file' - PEM encoded certificates)")
AP_SRV_CMD(ProxyCACertificatePath, TAKE1, SSL_CMD_SRV(ProxyCACertificatePath, TAKE1,
"SSL Proxy: directory containing server certificates " "SSL Proxy: directory containing server certificates "
"(`/path/to/dir' - contains PEM encoded certificates)") "(`/path/to/dir' - contains PEM encoded certificates)")
AP_SRV_CMD(ProxyMachineCertificateFile, TAKE1, SSL_CMD_SRV(ProxyMachineCertificateFile, TAKE1,
"SSL Proxy: file containing client certificates " "SSL Proxy: file containing client certificates "
"(`/path/to/file' - PEM encoded certificates)") "(`/path/to/file' - PEM encoded certificates)")
AP_SRV_CMD(ProxyMachineCertificatePath, TAKE1, SSL_CMD_SRV(ProxyMachineCertificatePath, TAKE1,
"SSL Proxy: directory containing client certificates " "SSL Proxy: directory containing client certificates "
"(`/path/to/dir' - contains PEM encoded certificates)") "(`/path/to/dir' - contains PEM encoded certificates)")
#endif #endif
@@ -181,71 +185,140 @@ static const command_rec ssl_config_cmds[] = {
/* /*
* Per-directory context configuration directives * Per-directory context configuration directives
*/ */
AP_DIR_CMD(Options, OPTIONS, RAW_ARGS, SSL_CMD_DIR(Options, OPTIONS, RAW_ARGS,
"Set one of more options to configure the SSL engine" "Set one of more options to configure the SSL engine"
"(`[+-]option[=value] ...' - see manual)") "(`[+-]option[=value] ...' - see manual)")
AP_DIR_CMD(RequireSSL, AUTHCFG, NO_ARGS, SSL_CMD_DIR(RequireSSL, AUTHCFG, NO_ARGS,
"Require the SSL protocol for the per-directory context " "Require the SSL protocol for the per-directory context "
"(no arguments)") "(no arguments)")
AP_DIR_CMD(Require, AUTHCFG, RAW_ARGS, SSL_CMD_DIR(Require, AUTHCFG, RAW_ARGS,
"Require a boolean expresion to evaluate to true for granting access" "Require a boolean expresion to evaluate to true for granting access"
"(arbitrary complex boolean expression - see manual)") "(arbitrary complex boolean expression - see manual)")
AP_END_CMD AP_END_CMD
}; };
#if 0 /* XXX */ /*
* the various processing hooks
*/
static const handler_rec ssl_config_handler[] = { static void ssl_hook_pre_config(
{ "mod_ssl:content-handler", ssl_hook_Handler }, apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptemp)
{ NULL, NULL } {
}; /* unused */
return;
}
static void ssl_hook_post_config(
apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptemp, server_rec *s)
{
/* ssl_init_Module() */
return;
}
static int ssl_hook_pre_connection(conn_rec *r)
{
/* unused */
return;
}
static int ssl_hook_process_connection(conn_rec *r)
{
/* call ssl_hook_NewConnection */
/* hook ssl_hook_CloseConnection() */
return;
}
static int ssl_hook_handler(request_rec *r)
{
/* ssl_hook_Handler() */
return;
}
static int ssl_hook_translate_name(request_rec *r)
{
/* ssl_hook_Translate() */
return;
}
static void ssl_hook_init_child(apr_pool_t *pchild, server_rec *s)
{
/* ssl_init_Child() */
return;
}
static int ssl_hook_auth_checker(request_rec *r)
{
/* ssl_hook_Auth() */
return;
}
static int ssl_hook_check_user_id(request_rec *r)
{
/* ssl_hook_UserCheck */
return;
}
static int ssl_hook_access_checker(request_rec *r)
{
/* ssl_hook_Access() */
return;
}
static int ssl_hook_fixups(request_rec *r)
{
/* ssl_hook_Fixup() */
return;
}
static int ssl_hook_post_read_request(request_rec *r)
{
/* ssl_hook_ReadReq() */
return;
}
static void ssl_hook_child_init(apr_pool_t *pchild, server_rec *s)
{
/* ssl_init_Child() */
return;
}
/* /*
* the main Apache API config structure * the module registration phase
*/ */
module MODULE_VAR_EXPORT ssl_module = { static void ssl_register_hooks(apr_pool_t *p)
STANDARD_MODULE_STUFF, {
ap_hook_pre_config (ssl_hook_pre_config, NULL, NULL, APR_HOOK_MIDDLE);
ap_hook_post_config (ssl_hook_post_config, NULL, NULL, APR_HOOK_MIDDLE);
ap_hook_handler (ssl_hook_handler, NULL, NULL, APR_HOOK_MIDDLE);
ap_hook_translate_name (ssl_hook_translate_name, NULL, NULL, APR_HOOK_MIDDLE);
ap_hook_child_init (ssl_hook_child_init, NULL, NULL, APR_HOOK_MIDDLE);
ap_hook_auth_checker (ssl_hook_auth_checker, NULL, NULL, APR_HOOK_MIDDLE);
ap_hook_check_user_id (ssl_hook_check_user_id, NULL, NULL, APR_HOOK_MIDDLE);
ap_hook_access_checker (ssl_hook_access_checker, NULL, NULL, APR_HOOK_MIDDLE);
ap_hook_fixups (ssl_hook_fixups, NULL, NULL, APR_HOOK_MIDDLE);
ap_hook_post_read_request (ssl_hook_post_read_request, NULL, NULL, APR_HOOK_MIDDLE);
ap_hook_pre_connection (ssl_hook_pre_connection, NULL, NULL, APR_HOOK_MIDDLE);
ap_hook_process_connection(ssl_hook_process_connection, NULL, NULL, APR_HOOK_MIDDLE);
/* Standard API (always present) */ ssl_var_register();
ssl_ext_register();
ssl_io_register();
ssl_init_Module, /* module initializer */ return;
ssl_config_perdir_create, /* create per-dir config structures */ }
ssl_config_perdir_merge, /* merge per-dir config structures */
ssl_config_server_create, /* create per-server config structures */
ssl_config_server_merge, /* merge per-server config structures */
ssl_config_cmds, /* table of config file commands */
ssl_config_handler, /* [#8] MIME-typed-dispatched handlers */
ssl_hook_Translate, /* [#1] URI to filename translation */
ssl_hook_Auth, /* [#4] validate user id from request */
ssl_hook_UserCheck, /* [#5] check if the user is ok _here_ */
ssl_hook_Access, /* [#3] check access by host address */
NULL, /* [#6] determine MIME type */
ssl_hook_Fixup, /* [#7] pre-run fixups */
NULL, /* [#9] log a transaction */
NULL, /* [#2] header parser */
ssl_init_Child, /* child_init */
NULL, /* child_exit */
ssl_hook_ReadReq, /* [#0] post read-request */
/* Extended API (forced to be enabled with mod_ssl) */
ssl_hook_AddModule, /* after modules was added to core */
ssl_hook_RemoveModule, /* before module is removed from core */
ssl_hook_RewriteCommand, /* configuration command rewriting */
ssl_hook_NewConnection, /* socket connection open */
ssl_hook_CloseConnection /* socket connection close */
};
#endif /* XXX */
/*
* the main module structure
*/
module AP_MODULE_DECLARE_DATA ssl_module = { module AP_MODULE_DECLARE_DATA ssl_module = {
STANDARD20_MODULE_STUFF, STANDARD20_MODULE_STUFF,
NULL, /* create per-directory config structure */ ssl_config_perdir_create, /* create per-dir config structures */
NULL, /* merge per-directory config structures */ ssl_config_perdir_merge, /* merge per-dir config structures */
NULL, /* create per-server config structure */ ssl_config_server_create, /* create per-server config structures */
NULL, /* merge per-server config structures */ ssl_config_server_merge, /* merge per-server config structures */
ssl_config_cmds, /* command apr_table_t */ ssl_config_cmds, /* table of configuration directives */
NULL /* register hooks */ ssl_register_hooks /* register hooks */
}; };

27
modules/ssl/mod_ssl.h
View File

@@ -124,15 +124,15 @@
#include "http_log.h" #include "http_log.h"
#include "scoreboard.h" #include "scoreboard.h"
#include "util_md5.h" #include "util_md5.h"
#include "apr.h"
#include "apr_fnmatch.h" #include "apr_fnmatch.h"
#include "apr_strings.h"
#undef CORE_PRIVATE #undef CORE_PRIVATE
/* mod_ssl headers */ /* mod_ssl headers */
#if 0 /* XXX */
#include "ssl_expr.h" #include "ssl_expr.h"
#include "ssl_util_ssl.h" #include "ssl_util_ssl.h"
#include "ssl_util_table.h" #include "ssl_util_table.h"
#endif /* XXX */
/* /*
* Provide reasonable default for some defines * Provide reasonable default for some defines
@@ -200,18 +200,7 @@
#define myCtxVarSet(mc,num,val) mc->rCtx.pV##num = val #define myCtxVarSet(mc,num,val) mc->rCtx.pV##num = val
#define myCtxVarGet(mc,num,type) (type)(mc->rCtx.pV##num) #define myCtxVarGet(mc,num,type) (type)(mc->rCtx.pV##num)
#endif /* XXX */
#define AP_ALL_CMD(name, args, desc) \
{ "SSL"#name, ssl_cmd_SSL##name, NULL, RSRC_CONF|OR_AUTHCFG, args, desc },
#define AP_SRV_CMD(name, args, desc) \
{ "SSL"#name, ssl_cmd_SSL##name, NULL, RSRC_CONF, args, desc },
#define AP_DIR_CMD(name, type, args, desc) \
{ "SSL"#name, ssl_cmd_SSL##name, NULL, OR_##type, args, desc },
#define AP_END_CMD \
{ NULL }
#if 0 /* XXX */
/* /*
* SSL Logging * SSL Logging
*/ */
@@ -588,15 +577,15 @@ typedef struct {
/* API glue structures */ /* API glue structures */
extern module MODULE_VAR_EXPORT ssl_module; extern module MODULE_VAR_EXPORT ssl_module;
#endif /* XXX */
/* configuration handling */ /* configuration handling */
void ssl_config_global_create(void); void ssl_config_global_create(void);
void ssl_config_global_fix(void); void ssl_config_global_fix(void);
BOOL ssl_config_global_isfixed(void); BOOL ssl_config_global_isfixed(void);
void *ssl_config_server_create(pool *, server_rec *); void *ssl_config_server_create(apr_pool_t *, server_rec *);
void *ssl_config_server_merge(pool *, void *, void *); void *ssl_config_server_merge(apr_pool_t *, void *, void *);
void *ssl_config_perdir_create(pool *, char *); void *ssl_config_perdir_create(apr_pool_t *, char *);
void *ssl_config_perdir_merge(pool *, void *, void *); void *ssl_config_perdir_merge(apr_pool_t *, void *, void *);
#endif /* XXX */
const char *ssl_cmd_SSLMutex(cmd_parms *, char *, char *); const char *ssl_cmd_SSLMutex(cmd_parms *, char *, char *);
const char *ssl_cmd_SSLPassPhraseDialog(cmd_parms *, char *, char *); const char *ssl_cmd_SSLPassPhraseDialog(cmd_parms *, char *, char *);
const char *ssl_cmd_SSLCryptoDevice(cmd_parms *, char *, char *); const char *ssl_cmd_SSLCryptoDevice(cmd_parms *, char *, char *);
@@ -646,8 +635,6 @@ void ssl_init_ChildKill(void *);
void ssl_init_ModuleKill(void *); void ssl_init_ModuleKill(void *);
/* Apache API hooks */ /* Apache API hooks */
void ssl_hook_AddModule(module *);
void ssl_hook_RemoveModule(module *);
void ssl_hook_NewConnection(conn_rec *); void ssl_hook_NewConnection(conn_rec *);
void ssl_hook_TimeoutConnection(int); void ssl_hook_TimeoutConnection(int);
void ssl_hook_CloseConnection(conn_rec *); void ssl_hook_CloseConnection(conn_rec *);

48
modules/ssl/ssl_engine_config.c
View File

@@ -70,32 +70,6 @@
** _________________________________________________________________ ** _________________________________________________________________
*/ */
void ssl_hook_AddModule(module *m)
{
if (m == &ssl_module) {
/*
* Link ourself into the Apache kernel
*/
ssl_var_register();
ssl_ext_register();
ssl_io_register();
}
return;
}
void ssl_hook_RemoveModule(module *m)
{
if (m == &ssl_module) {
/*
* Unlink ourself from the Apache kernel
*/
ssl_var_unregister();
ssl_ext_unregister();
ssl_io_unregister();
}
return;
}
void ssl_config_global_create(void) void ssl_config_global_create(void)
{ {
pool *pPool; pool *pPool;
@@ -155,6 +129,7 @@ BOOL ssl_config_global_isfixed(void)
return (mc->bFixed); return (mc->bFixed);
} }
#endif /* XXX */
/* _________________________________________________________________ /* _________________________________________________________________
** **
@@ -165,8 +140,9 @@ BOOL ssl_config_global_isfixed(void)
/* /*
* Create per-server SSL configuration * Create per-server SSL configuration
*/ */
void *ssl_config_server_create(pool *p, server_rec *s) void *ssl_config_server_create(apr_pool_t *p, server_rec *s)
{ {
#if 0 /* XXX */
SSLSrvConfigRec *sc; SSLSrvConfigRec *sc;
ssl_config_global_create(); ssl_config_global_create();
@@ -209,13 +185,16 @@ void *ssl_config_server_create(pool *p, server_rec *s)
(void)memset(sc->pPrivateKey, 0, SSL_AIDX_MAX*sizeof(EVP_PKEY *)); (void)memset(sc->pPrivateKey, 0, SSL_AIDX_MAX*sizeof(EVP_PKEY *));
return sc; return sc;
#endif /* XXX */
return NULL;
} }
/* /*
* Merge per-server SSL configurations * Merge per-server SSL configurations
*/ */
void *ssl_config_server_merge(pool *p, void *basev, void *addv) void *ssl_config_server_merge(apr_pool_t *p, void *basev, void *addv)
{ {
#if 0 /* XXX */
SSLSrvConfigRec *base = (SSLSrvConfigRec *)basev; SSLSrvConfigRec *base = (SSLSrvConfigRec *)basev;
SSLSrvConfigRec *add = (SSLSrvConfigRec *)addv; SSLSrvConfigRec *add = (SSLSrvConfigRec *)addv;
SSLSrvConfigRec *new = (SSLSrvConfigRec *)ap_palloc(p, sizeof(SSLSrvConfigRec)); SSLSrvConfigRec *new = (SSLSrvConfigRec *)ap_palloc(p, sizeof(SSLSrvConfigRec));
@@ -260,13 +239,16 @@ void *ssl_config_server_merge(pool *p, void *basev, void *addv)
#endif #endif
return new; return new;
#endif /* XXX */
return NULL;
} }
/* /*
* Create per-directory SSL configuration * Create per-directory SSL configuration
*/ */
void *ssl_config_perdir_create(pool *p, char *dir) void *ssl_config_perdir_create(apr_pool_t *p, char *dir)
{ {
#if 0 /* XXX */
SSLDirConfigRec *dc = ap_palloc(p, sizeof(SSLDirConfigRec)); SSLDirConfigRec *dc = ap_palloc(p, sizeof(SSLDirConfigRec));
dc->bSSLRequired = FALSE; dc->bSSLRequired = FALSE;
@@ -284,13 +266,16 @@ void *ssl_config_perdir_create(pool *p, char *dir)
#endif #endif
return dc; return dc;
#endif /* XXX */
return NULL;
} }
/* /*
* Merge per-directory SSL configurations * Merge per-directory SSL configurations
*/ */
void *ssl_config_perdir_merge(pool *p, void *basev, void *addv) void *ssl_config_perdir_merge(apr_pool_t *p, void *basev, void *addv)
{ {
#if 0 /* XXX */
SSLDirConfigRec *base = (SSLDirConfigRec *)basev; SSLDirConfigRec *base = (SSLDirConfigRec *)basev;
SSLDirConfigRec *add = (SSLDirConfigRec *)addv; SSLDirConfigRec *add = (SSLDirConfigRec *)addv;
SSLDirConfigRec *new = (SSLDirConfigRec *)ap_palloc(p, SSLDirConfigRec *new = (SSLDirConfigRec *)ap_palloc(p,
@@ -319,9 +304,10 @@ void *ssl_config_perdir_merge(pool *p, void *basev, void *addv)
#endif #endif
return new; return new;
#endif /* XXX */
return NULL;
} }
#endif /* XXX */
/* /*
* Configuration functions for particular directives * Configuration functions for particular directives

10
modules/ssl/ssl_engine_ext.c
View File

@@ -61,14 +61,13 @@
-- Unknown */ -- Unknown */
#include "mod_ssl.h" #include "mod_ssl.h"
#if 0 /* XXX */
/* _________________________________________________________________ /* _________________________________________________________________
** **
** SSL Extensions ** SSL Extensions
** _________________________________________________________________ ** _________________________________________________________________
*/ */
#if 0 /* XXX */
static void ssl_ext_mlc_register(void); static void ssl_ext_mlc_register(void);
static void ssl_ext_mlc_unregister(void); static void ssl_ext_mlc_unregister(void);
static void ssl_ext_mr_register(void); static void ssl_ext_mr_register(void);
@@ -77,25 +76,32 @@ static void ssl_ext_mp_register(void);
static void ssl_ext_mp_unregister(void); static void ssl_ext_mp_unregister(void);
static void ssl_ext_ms_register(void); static void ssl_ext_ms_register(void);
static void ssl_ext_ms_unregister(void); static void ssl_ext_ms_unregister(void);
#endif /* XXX */
void ssl_ext_register(void) void ssl_ext_register(void)
{ {
#if 0 /* XXX */
ssl_ext_mlc_register(); ssl_ext_mlc_register();
ssl_ext_mr_register(); ssl_ext_mr_register();
ssl_ext_mp_register(); ssl_ext_mp_register();
ssl_ext_ms_register(); ssl_ext_ms_register();
#endif /* XXX */
return; return;
} }
void ssl_ext_unregister(void) void ssl_ext_unregister(void)
{ {
#if 0 /* XXX */
ssl_ext_mlc_unregister(); ssl_ext_mlc_unregister();
ssl_ext_mr_unregister(); ssl_ext_mr_unregister();
ssl_ext_mp_unregister(); ssl_ext_mp_unregister();
ssl_ext_ms_unregister(); ssl_ext_ms_unregister();
#endif /* XXX */
return; return;
} }
#if 0 /* XXX */
/* _________________________________________________________________ /* _________________________________________________________________
** **
** SSL Extension to mod_log_config ** SSL Extension to mod_log_config

10
modules/ssl/ssl_engine_io.c
View File

@@ -62,31 +62,37 @@
-- Unknown */ -- Unknown */
#include "mod_ssl.h" #include "mod_ssl.h"
#if 0 /* XXX */
/* _________________________________________________________________ /* _________________________________________________________________
** **
** I/O Hooks ** I/O Hooks
** _________________________________________________________________ ** _________________________________________________________________
*/ */
#if 0 /* XXX */
static int ssl_io_hook_read(BUFF *fb, char *buf, int len); static int ssl_io_hook_read(BUFF *fb, char *buf, int len);
static int ssl_io_hook_write(BUFF *fb, char *buf, int len); static int ssl_io_hook_write(BUFF *fb, char *buf, int len);
#endif /* XXX */
void ssl_io_register(void) void ssl_io_register(void)
{ {
#if 0 /* XXX */
ap_hook_register("ap::buff::read", ssl_io_hook_read, AP_HOOK_NOCTX); ap_hook_register("ap::buff::read", ssl_io_hook_read, AP_HOOK_NOCTX);
ap_hook_register("ap::buff::write", ssl_io_hook_write, AP_HOOK_NOCTX); ap_hook_register("ap::buff::write", ssl_io_hook_write, AP_HOOK_NOCTX);
#endif /* XXX */
return; return;
} }
void ssl_io_unregister(void) void ssl_io_unregister(void)
{ {
#if 0 /* XXX */
ap_hook_unregister("ap::buff::read", ssl_io_hook_read); ap_hook_unregister("ap::buff::read", ssl_io_hook_read);
ap_hook_unregister("ap::buff::write", ssl_io_hook_write); ap_hook_unregister("ap::buff::write", ssl_io_hook_write);
#endif /* XXX */
return; return;
} }
#if 0 /* XXX */
static int ssl_io_hook_read(BUFF *fb, char *buf, int len) static int ssl_io_hook_read(BUFF *fb, char *buf, int len)
{ {
SSL *ssl; SSL *ssl;

2
modules/ssl/ssl_engine_kernel.c
View File

@@ -543,6 +543,8 @@ int ssl_hook_Handler(request_rec *r)
char *thisport; char *thisport;
char *thisurl; char *thisurl;
if (strNE(r->handler, "mod_ssl:content-handler"))
return DECLINED;
if (strNEn(r->uri, "/mod_ssl:", 9)) if (strNEn(r->uri, "/mod_ssl:", 9))
return DECLINED; return DECLINED;

10
modules/ssl/ssl_engine_vars.c
View File

@@ -62,14 +62,13 @@
-- Unknown */ -- Unknown */
#include "mod_ssl.h" #include "mod_ssl.h"
#if 0 /* XXX */
/* _________________________________________________________________ /* _________________________________________________________________
** **
** Variable Lookup ** Variable Lookup
** _________________________________________________________________ ** _________________________________________________________________
*/ */
#if 0 /* XXX */
static char *ssl_var_lookup_header(pool *p, request_rec *r, const char *name); static char *ssl_var_lookup_header(pool *p, request_rec *r, const char *name);
static char *ssl_var_lookup_ssl(pool *p, conn_rec *c, char *var); static char *ssl_var_lookup_ssl(pool *p, conn_rec *c, char *var);
static char *ssl_var_lookup_ssl_cert(pool *p, X509 *xs, char *var); static char *ssl_var_lookup_ssl_cert(pool *p, X509 *xs, char *var);
@@ -82,22 +81,29 @@ static char *ssl_var_lookup_ssl_cert_verify(pool *p, conn_rec *c);
static char *ssl_var_lookup_ssl_cipher(pool *p, conn_rec *c, char *var); static char *ssl_var_lookup_ssl_cipher(pool *p, conn_rec *c, char *var);
static void ssl_var_lookup_ssl_cipher_bits(SSL *ssl, int *usekeysize, int *algkeysize); static void ssl_var_lookup_ssl_cipher_bits(SSL *ssl, int *usekeysize, int *algkeysize);
static char *ssl_var_lookup_ssl_version(pool *p, char *var); static char *ssl_var_lookup_ssl_version(pool *p, char *var);
#endif /* XXX */
void ssl_var_register(void) void ssl_var_register(void)
{ {
#if 0 /* XXX */
ap_hook_configure("ap::mod_ssl::var_lookup", ap_hook_configure("ap::mod_ssl::var_lookup",
AP_HOOK_SIG6(ptr,ptr,ptr,ptr,ptr,ptr), AP_HOOK_DECLINE(NULL)); AP_HOOK_SIG6(ptr,ptr,ptr,ptr,ptr,ptr), AP_HOOK_DECLINE(NULL));
ap_hook_register("ap::mod_ssl::var_lookup", ap_hook_register("ap::mod_ssl::var_lookup",
ssl_var_lookup, AP_HOOK_NOCTX); ssl_var_lookup, AP_HOOK_NOCTX);
#endif /* XXX */
return; return;
} }
void ssl_var_unregister(void) void ssl_var_unregister(void)
{ {
#if 0 /* XXX */
ap_hook_unregister("ap::mod_ssl::var_lookup", ssl_var_lookup); ap_hook_unregister("ap::mod_ssl::var_lookup", ssl_var_lookup);
#endif /* XXX */
return; return;
} }
#if 0 /* XXX */
char *ssl_var_lookup(pool *p, server_rec *s, conn_rec *c, request_rec *r, char *var) char *ssl_var_lookup(pool *p, server_rec *s, conn_rec *c, request_rec *r, char *var)
{ {
SSLModConfigRec *mc = myModConfig(); SSLModConfigRec *mc = myModConfig();