/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
trying to perfect the art of
never finishing something.''
-- Rob Hartill */
-#ifndef MOD_SSL_H
-#define MOD_SSL_H 1
+#ifndef __MOD_SSL_H__
+#define __MOD_SSL_H__
/*
* Optionally enable the experimental stuff, but allow the user to
* override the decision which experimental parts are included by using
* CFLAGS="-DSSL_EXPERIMENTAL_xxxx_IGNORE".
*/
-#if 0 /* XXX */
#ifdef SSL_EXPERIMENTAL
-#ifndef SSL_EXPERIMENTAL_PERDIRCA_IGNORE
-#define SSL_EXPERIMENTAL_PERDIRCA
-#endif
#ifndef SSL_EXPERIMENTAL_PROXY_IGNORE
#define SSL_EXPERIMENTAL_PROXY
#endif
#endif
#endif
#endif /* SSL_EXPERIMENTAL */
-#endif /* XXX */
+
+/* XXX: add configure check */
+#ifndef MODSSL_HAVE_SSL_SET_CERT_STORE
+#define MODSSL_HAVE_SSL_SET_CERT_STORE 0
+#endif
/*
* Power up our brain...
*/
-/* OS headers */
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <time.h>
-#ifndef WIN32
-#include <sys/time.h>
-#endif
-#ifdef WIN32
-#include <wincrypt.h>
-#include <winsock2.h>
-#endif
-
-/* OpenSSL headers */
-#include <openssl/ssl.h>
-#include <openssl/err.h>
-#include <openssl/x509.h>
-#include <openssl/x509v3.h>
-#include <openssl/pem.h>
-#include <openssl/crypto.h>
-#include <openssl/evp.h>
-#include <openssl/rand.h>
-#ifdef SSL_EXPERIMENTAL_ENGINE
-#include <openssl/engine.h>
-#endif
-
/* Apache headers */
-#define CORE_PRIVATE
-#include "ap_config.h"
#include "httpd.h"
#include "http_config.h"
-#include "http_protocol.h"
-#include "http_request.h"
-#include "http_main.h"
#include "http_core.h"
#include "http_log.h"
-#include "scoreboard.h"
-#include "util_md5.h"
+#include "http_main.h"
+#include "http_connection.h"
+#include "http_request.h"
+#include "http_protocol.h"
+#include "util_script.h"
+#include "util_filter.h"
+#include "mpm.h"
+#include "apr.h"
+#include "apr_strings.h"
+#include "apr_tables.h"
+#include "apr_lib.h"
#include "apr_fnmatch.h"
-#undef CORE_PRIVATE
+#include "apr_strings.h"
+#include "apr_dbm.h"
+#include "apr_rmm.h"
+#include "apr_shm.h"
+#include "apr_optional.h"
+
+#define MOD_SSL_VERSION AP_SERVER_BASEVERSION
+
+/* OpenSSL headers */
+#include <ssl.h>
+#include <err.h>
+#include <x509.h>
+#include <pem.h>
+#include <crypto.h>
+#include <evp.h>
+#include <rand.h>
+#ifdef SSL_EXPERIMENTAL_ENGINE
+#include <engine.h>
+#endif
+
+#include "ssl_toolkit_compat.h"
+
+#ifdef HAVE_SSL_X509V3_H
+#include <x509v3.h>
+#endif
/* mod_ssl headers */
-#if 0 /* XXX */
#include "ssl_expr.h"
#include "ssl_util_ssl.h"
#include "ssl_util_table.h"
-#endif /* XXX */
+
+/* The #ifdef macros are only defined AFTER including the above
+ * therefore we cannot include these system files at the top :-(
+ */
+#if APR_HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#if APR_HAVE_UNISTD_H
+#include <unistd.h> /* needed for STDIN_FILENO et.al., at least on FreeBSD */
+#endif
/*
* Provide reasonable default for some defines
#define strIsEmpty(s) (s == NULL || s[0] == NUL)
-#if 0 /* XXX */
-#define cfgMerge(el,unset) new->el = add->el == unset ? base->el : add->el
-#define cfgMergeArray(el) new->el = ap_append_arrays(p, add->el, base->el)
-#define cfgMergeTable(el) new->el = ap_overlay_tables(p, add->el, base->el)
-#define cfgMergeCtx(el) new->el = ap_ctx_overlay(p, add->el, base->el)
+#define cfgMerge(el,unset) mrg->el = (add->el == (unset)) ? base->el : add->el
+#define cfgMergeArray(el) mrg->el = apr_array_append(p, add->el, base->el)
+#define cfgMergeTable(el) mrg->el = apr_table_overlay(p, add->el, base->el)
+#define cfgMergeCtx(el) mrg->el = apr_table_overlay(p, add->el, base->el)
#define cfgMergeString(el) cfgMerge(el, NULL)
#define cfgMergeBool(el) cfgMerge(el, UNSET)
#define cfgMergeInt(el) cfgMerge(el, UNSET)
-#define myModConfig() (SSLModConfigRec *)ap_ctx_get(ap_global_ctx, "ssl_module")
+#define myConnConfig(c) \
+(SSLConnRec *)ap_get_module_config(c->conn_config, &ssl_module)
+#define myConnConfigSet(c, val) \
+ap_set_module_config(c->conn_config, &ssl_module, val)
#define mySrvConfig(srv) (SSLSrvConfigRec *)ap_get_module_config(srv->module_config, &ssl_module)
#define myDirConfig(req) (SSLDirConfigRec *)ap_get_module_config(req->per_dir_config, &ssl_module)
+#define myModConfig(srv) (mySrvConfig((srv)))->mc
#define myCtxVarSet(mc,num,val) mc->rCtx.pV##num = val
#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
*/
#define SSL_NO_TIMESTAMP (1<<11)
#define SSL_NO_LEVELID (1<<12)
#define SSL_NO_NEWLINE (1<<13)
+#define SSL_INIT (1<<14)
/*
* Defaults for the configuration
#define SSL_SESSION_CACHE_TIMEOUT 300
#endif
-/*
- * Support for file locking: Try to determine whether we should use fcntl() or
- * flock(). Would be better ap_config.h could provide this... :-(
- */
-#if defined(USE_FCNTL_SERIALIZED_ACCEPT)
-#define SSL_USE_FCNTL 1
-#include <fcntl.h>
-#endif
-#if defined(USE_FLOCK_SERIALIZED_ACCEPT)
-#define SSL_USE_FLOCK 1
-#include <sys/file.h>
-#endif
-#if !defined(SSL_USE_FCNTL) && !defined(SSL_USE_FLOCK)
-#define SSL_USE_FLOCK 1
-#if !defined(MPE) && !defined(WIN32)
-#include <sys/file.h>
-#endif
-#ifndef LOCK_UN
-#undef SSL_USE_FLOCK
-#define SSL_USE_FCNTL 1
-#include <fcntl.h>
-#endif
-#endif
-#ifdef AIX
-#undef SSL_USE_FLOCK
-#define SSL_USE_FCNTL 1
-#include <fcntl.h>
-#endif
-
-/*
- * Support for Mutex
- */
-#ifndef WIN32
-#define SSL_MUTEX_LOCK_MODE ( S_IRUSR|S_IWUSR )
-#else
-#define SSL_MUTEX_LOCK_MODE (_S_IREAD|_S_IWRITE )
-#endif
-#if defined(USE_SYSVSEM_SERIALIZED_ACCEPT) ||\
- (defined(__FreeBSD__) && defined(__FreeBSD_version) &&\
- __FreeBSD_version >= 300000) ||\
- (defined(LINUX) && defined(__GLIBC__) && defined(__GLIBC_MINOR__) &&\
- LINUX >= 2 && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1) ||\
- defined(SOLARIS2) || defined(__hpux) ||\
- (defined (__digital__) && defined (__unix__))
-#define SSL_CAN_USE_SEM
-#define SSL_HAVE_IPCSEM
-#include <sys/types.h>
-#include <sys/ipc.h>
-#include <sys/sem.h>
-/*
- * Some platforms have a `union semun' pre-defined but Single Unix
- * Specification (SUSv2) says in semctl(2): `If required, it is of
- * type union semun, which the application program must explicitly
- * declare'. So we define it always ourself to avoid problems (but under
- * a different name to avoid a namespace clash).
- */
-union ssl_ipc_semun {
- long val;
- struct semid_ds *buf;
- unsigned short int *array;
-};
-#endif
-#ifdef WIN32
-#define SSL_CAN_USE_SEM
-#define SSL_HAVE_W32SEM
-#include "multithread.h"
-#include <process.h>
-#endif
-
/*
* Support for MM library
*/
-#ifndef WIN32
-#define SSL_MM_FILE_MODE ( S_IRUSR|S_IWUSR )
-#else
-#define SSL_MM_FILE_MODE ( _S_IREAD|_S_IWRITE )
-#endif
+#define SSL_MM_FILE_MODE ( APR_UREAD | APR_UWRITE | APR_GREAD | APR_WREAD )
/*
* Support for DBM library
*/
-#ifndef WIN32
-#define SSL_DBM_FILE_MODE ( S_IRUSR|S_IWUSR )
-#else
-#define SSL_USE_SDBM
-#define SSL_DBM_FILE_MODE ( _S_IREAD|_S_IWRITE )
-#endif
+#define SSL_DBM_FILE_MODE ( APR_UREAD | APR_UWRITE | APR_GREAD | APR_WREAD )
-#ifdef SSL_USE_SDBM
-#include "ssl_util_sdbm.h"
-#define ssl_dbm_open sdbm_open
-#define ssl_dbm_close sdbm_close
-#define ssl_dbm_store sdbm_store
-#define ssl_dbm_fetch sdbm_fetch
-#define ssl_dbm_delete sdbm_delete
-#define ssl_dbm_firstkey sdbm_firstkey
-#define ssl_dbm_nextkey sdbm_nextkey
-#define SSL_DBM_FILE_SUFFIX_DIR ".dir"
-#define SSL_DBM_FILE_SUFFIX_PAG ".pag"
-#else /* !SSL_USE_SDBM */
-#if defined(__GLIBC__) && defined(__GLIBC_MINOR__) \
- && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1
-#include <db1/ndbm.h>
-#else
-#include <ndbm.h>
-#endif
-#define ssl_dbm_open dbm_open
-#define ssl_dbm_close dbm_close
-#define ssl_dbm_store dbm_store
-#define ssl_dbm_fetch dbm_fetch
-#define ssl_dbm_delete dbm_delete
-#define ssl_dbm_firstkey dbm_firstkey
-#define ssl_dbm_nextkey dbm_nextkey
#if !defined(SSL_DBM_FILE_SUFFIX_DIR) && !defined(SSL_DBM_FILE_SUFFIX_PAG)
#if defined(DBM_SUFFIX)
#define SSL_DBM_FILE_SUFFIX_DIR DBM_SUFFIX
#define SSL_DBM_FILE_SUFFIX_PAG ".pag"
#endif
#endif
-#endif /* !SSL_USE_SDBM */
-
-/*
- * Check for OpenSSL version
- */
-#if SSL_LIBRARY_VERSION < 0x00903100
-#error "mod_ssl requires OpenSSL 0.9.3 or higher"
-#endif
-
-/*
- * The own data structures
- */
-typedef struct {
- pool *pPool;
- pool *pSubPool;
- array_header *aData;
-} ssl_ds_array;
-
-typedef struct {
- pool *pPool;
- pool *pSubPool;
- array_header *aKey;
- array_header *aData;
-} ssl_ds_table;
/*
* Define the certificate algorithm types
#define SSL_AIDX_DSA (1)
#define SSL_AIDX_MAX (2)
+
/*
* Define IDs for the temporary RSA keys and DH params
*/
-#define SSL_TKP_GEN (0)
-#define SSL_TKP_ALLOC (1)
-#define SSL_TKP_FREE (2)
-
-#define SSL_TKPIDX_RSA512 (0)
-#define SSL_TKPIDX_RSA1024 (1)
-#define SSL_TKPIDX_DH512 (2)
-#define SSL_TKPIDX_DH1024 (3)
-#define SSL_TKPIDX_MAX (4)
+#define SSL_TMP_KEY_RSA_512 (0)
+#define SSL_TMP_KEY_RSA_1024 (1)
+#define SSL_TMP_KEY_DH_512 (2)
+#define SSL_TMP_KEY_DH_1024 (3)
+#define SSL_TMP_KEY_MAX (4)
/*
* Define the SSL options
SSL_CVERIFY_OPTIONAL_NO_CA = 3
} ssl_verify_t;
+#define SSL_VERIFY_PEER_STRICT \
+ (SSL_VERIFY_PEER|SSL_VERIFY_FAIL_IF_NO_PEER_CERT)
+
+#ifndef X509_V_ERR_CERT_UNTRUSTED
+#define X509_V_ERR_CERT_UNTRUSTED 27
+#endif
+
+#define ssl_verify_error_is_optional(errnum) \
+ ((errnum == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT) \
+ || (errnum == X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN) \
+ || (errnum == X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY) \
+ || (errnum == X509_V_ERR_CERT_UNTRUSTED) \
+ || (errnum == X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE))
+
/*
* Define the SSL pass phrase dialog types
*/
typedef enum {
SSL_PPTYPE_UNSET = UNSET,
SSL_PPTYPE_BUILTIN = 0,
- SSL_PPTYPE_FILTER = 1
+ SSL_PPTYPE_FILTER = 1,
+ SSL_PPTYPE_PIPE = 2
} ssl_pphrase_t;
/*
typedef enum {
SSL_MUTEXMODE_UNSET = UNSET,
SSL_MUTEXMODE_NONE = 0,
- SSL_MUTEXMODE_FILE = 1,
- SSL_MUTEXMODE_SEM = 2
+ SSL_MUTEXMODE_USED = 1
} ssl_mutexmode_t;
/*
typedef enum {
SSL_RSSRC_BUILTIN = 1,
SSL_RSSRC_FILE = 2,
- SSL_RSSRC_EXEC = 3
-#if SSL_LIBRARY_VERSION >= 0x00905100
- ,SSL_RSSRC_EGD = 4
-#endif
+ SSL_RSSRC_EXEC = 3,
+ SSL_RSSRC_EGD = 4
} ssl_rssrc_t;
typedef struct {
ssl_rsctx_t nCtx;
typedef struct {
long int nData;
unsigned char *cpData;
+ apr_time_t source_mtime;
} ssl_asn1_t;
/*
*/
typedef struct {
- pool *pPool;
+ SSL *pssl;
+ BIO *pbioRead;
+ BIO *pbioWrite;
+ ap_filter_t *pInputFilter;
+ ap_filter_t *pOutputFilter;
+} SSLFilterRec;
+
+typedef enum {
+ SSL_SHUTDOWN_TYPE_UNSET,
+ SSL_SHUTDOWN_TYPE_STANDARD,
+ SSL_SHUTDOWN_TYPE_UNCLEAN,
+ SSL_SHUTDOWN_TYPE_ACCURATE
+} ssl_shutdown_type_e;
+
+typedef struct {
+ SSL *ssl;
+ const char *client_dn;
+ X509 *client_cert;
+ ssl_shutdown_type_e shutdown_type;
+ const char *verify_info;
+ const char *verify_error;
+ int verify_depth;
+ int log_level; /* for avoiding expensive logging */
+} SSLConnRec;
+
+#define SSLConnLogApplies(sslconn, level) (sslconn->log_level >= level)
+
+typedef struct {
+ pid_t pid;
+ apr_pool_t *pPool;
BOOL bFixed;
- int nInitCount;
int nSessionCacheMode;
char *szSessionCacheDataFile;
int nSessionCacheDataSize;
- AP_MM *pSessionCacheDataMM;
- table_t *tSessionCacheDataTable;
+ apr_shm_t *pSessionCacheDataMM;
+ apr_rmm_t *pSessionCacheDataRMM;
+ apr_table_t *tSessionCacheDataTable;
ssl_mutexmode_t nMutexMode;
- char *szMutexFile;
- int nMutexFD;
- int nMutexSEMID;
- array_header *aRandSeed;
- ssl_ds_table *tTmpKeys;
- void *pTmpKeys[SSL_TKPIDX_MAX];
- ssl_ds_table *tPublicCert;
- ssl_ds_table *tPrivateKey;
+ const char *szMutexFile;
+ apr_lock_t *pMutex;
+ apr_array_header_t *aRandSeed;
+ apr_hash_t *tVHostKeys;
+ void *pTmpKeys[SSL_TMP_KEY_MAX];
+ apr_hash_t *tPublicCert;
+ apr_hash_t *tPrivateKey;
#ifdef SSL_EXPERIMENTAL_ENGINE
char *szCryptoDevice;
#endif
struct {
void *pV1, *pV2, *pV3, *pV4, *pV5, *pV6, *pV7, *pV8, *pV9, *pV10;
} rCtx;
-#ifdef SSL_VENDOR
- ap_ctx *ctx;
-#endif
} SSLModConfigRec;
/*
* and all <VirtualHost> contexts)
*/
typedef struct {
- BOOL bEnabled;
- char *szPublicCertFile[SSL_AIDX_MAX];
- char *szPrivateKeyFile[SSL_AIDX_MAX];
- char *szCertificateChain;
- char *szCACertificatePath;
- char *szCACertificateFile;
- char *szLogFile;
- char *szCipherSuite;
- FILE *fileLogFile;
- int nLogLevel;
+ SSLModConfigRec *mc;
+ BOOL enabled;
+ const char *vhost_id;
+ int vhost_id_len;
+ const char *log_file_name;
+ apr_file_t *log_file;
+ int log_level;
+ int session_cache_timeout;
+
+ const char *szPublicCertFiles[SSL_AIDX_MAX];
+ const char *szPrivateKeyFiles[SSL_AIDX_MAX];
+ const char *szCertificateChain;
+ const char *szCACertificatePath;
+ const char *szCACertificateFile;
+ const char *szCipherSuite;
int nVerifyDepth;
ssl_verify_t nVerifyClient;
X509 *pPublicCert[SSL_AIDX_MAX];
EVP_PKEY *pPrivateKey[SSL_AIDX_MAX];
SSL_CTX *pSSLCtx;
- int nSessionCacheTimeout;
int nPassPhraseDialogType;
- char *szPassPhraseDialogPath;
+ const char *szPassPhraseDialogPath;
ssl_proto_t nProtocol;
- char *szCARevocationPath;
- char *szCARevocationFile;
+ const char *szCARevocationPath;
+ const char *szCARevocationFile;
X509_STORE *pRevocationStore;
#ifdef SSL_EXPERIMENTAL_PROXY
/* Configuration details for proxy operation */
ssl_proto_t nProxyProtocol;
int bProxyVerify;
int nProxyVerifyDepth;
- char *szProxyCACertificatePath;
- char *szProxyCACertificateFile;
- char *szProxyClientCertificateFile;
- char *szProxyClientCertificatePath;
- char *szProxyCipherSuite;
+ const char *szProxyCACertificatePath;
+ const char *szProxyCACertificateFile;
+ const char *szProxyClientCertificateFile;
+ const char *szProxyClientCertificatePath;
+ const char *szProxyCipherSuite;
SSL_CTX *pSSLProxyCtx;
STACK_OF(X509_INFO) *skProxyClientCerts;
#endif
-#ifdef SSL_VENDOR
- ap_ctx *ctx;
-#endif
} SSLSrvConfigRec;
/*
* (i.e. the local configuration for all <Directory>
* and .htaccess contexts)
*/
-#endif /* XXX */
typedef struct {
-#if 0 /* XXX */
BOOL bSSLRequired;
- array_header *aRequirement;
+ apr_array_header_t *aRequirement;
ssl_opt_t nOptions;
ssl_opt_t nOptionsAdd;
ssl_opt_t nOptionsDel;
- char *szCipherSuite;
+ const char *szCipherSuite;
ssl_verify_t nVerifyClient;
int nVerifyDepth;
-#ifdef SSL_EXPERIMENTAL_PERDIRCA
- char *szCACertificatePath;
- char *szCACertificateFile;
-#endif
-#ifdef SSL_VENDOR
- ap_ctx *ctx;
-#endif
-#endif /* XXX */
+ const char *szCACertificatePath;
+ const char *szCACertificateFile;
} SSLDirConfigRec;
-#if 0 /* XXX */
/*
* function prototypes
*/
/* API glue structures */
-extern module MODULE_VAR_EXPORT ssl_module;
+extern module AP_MODULE_DECLARE_DATA ssl_module;
/* configuration handling */
-void ssl_config_global_create(void);
-void ssl_config_global_fix(void);
-BOOL ssl_config_global_isfixed(void);
-void *ssl_config_server_create(pool *, server_rec *);
-void *ssl_config_server_merge(pool *, void *, void *);
-void *ssl_config_perdir_create(pool *, char *);
-void *ssl_config_perdir_merge(pool *, void *, void *);
-#endif /* XXX */
-const char *ssl_cmd_SSLMutex(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_SSLRandomSeed(cmd_parms *, char *, char *, char *, char *);
-const char *ssl_cmd_SSLEngine(cmd_parms *, char *, int);
-const char *ssl_cmd_SSLCipherSuite(cmd_parms *, SSLDirConfigRec *, char *);
-const char *ssl_cmd_SSLCertificateFile(cmd_parms *, char *, char *);
-const char *ssl_cmd_SSLCertificateKeyFile(cmd_parms *, char *, char *);
-const char *ssl_cmd_SSLCertificateChainFile(cmd_parms *, char *, char *);
-const char *ssl_cmd_SSLCACertificatePath(cmd_parms *, SSLDirConfigRec *, char *);
-const char *ssl_cmd_SSLCACertificateFile(cmd_parms *, SSLDirConfigRec *, char *);
-const char *ssl_cmd_SSLCARevocationPath(cmd_parms *, SSLDirConfigRec *, char *);
-const char *ssl_cmd_SSLCARevocationFile(cmd_parms *, SSLDirConfigRec *, char *);
-const char *ssl_cmd_SSLVerifyClient(cmd_parms *, SSLDirConfigRec *, char *);
-const char *ssl_cmd_SSLVerifyDepth(cmd_parms *, SSLDirConfigRec *, char *);
-const char *ssl_cmd_SSLSessionCache(cmd_parms *, char *, char *);
-const char *ssl_cmd_SSLSessionCacheTimeout(cmd_parms *, char *, char *);
-const char *ssl_cmd_SSLLog(cmd_parms *, char *, char *);
-const char *ssl_cmd_SSLLogLevel(cmd_parms *, char *, char *);
-const char *ssl_cmd_SSLProtocol(cmd_parms *, char *, const char *);
-const char *ssl_cmd_SSLOptions(cmd_parms *, SSLDirConfigRec *, const char *);
-const char *ssl_cmd_SSLRequireSSL(cmd_parms *, SSLDirConfigRec *, char *);
-const char *ssl_cmd_SSLRequire(cmd_parms *, SSLDirConfigRec *, char *);
+SSLModConfigRec *ssl_config_global_create(server_rec *);
+void ssl_config_global_fix(SSLModConfigRec *);
+BOOL ssl_config_global_isfixed(SSLModConfigRec *);
+void *ssl_config_server_create(apr_pool_t *, server_rec *);
+void *ssl_config_server_merge(apr_pool_t *, void *, void *);
+void *ssl_config_perdir_create(apr_pool_t *, char *);
+void *ssl_config_perdir_merge(apr_pool_t *, void *, void *);
+const char *ssl_cmd_SSLMutex(cmd_parms *, void *, const char *);
+const char *ssl_cmd_SSLPassPhraseDialog(cmd_parms *, void *, const char *);
+const char *ssl_cmd_SSLCryptoDevice(cmd_parms *, void *, const char *);
+const char *ssl_cmd_SSLRandomSeed(cmd_parms *, void *, const char *, const char *, const char *);
+const char *ssl_cmd_SSLEngine(cmd_parms *, void *, int);
+const char *ssl_cmd_SSLCipherSuite(cmd_parms *, void *, const char *);
+const char *ssl_cmd_SSLCertificateFile(cmd_parms *, void *, const char *);
+const char *ssl_cmd_SSLCertificateKeyFile(cmd_parms *, void *, const char *);
+const char *ssl_cmd_SSLCertificateChainFile(cmd_parms *, void *, const char *);
+const char *ssl_cmd_SSLCACertificatePath(cmd_parms *, void *, const char *);
+const char *ssl_cmd_SSLCACertificateFile(cmd_parms *, void *, const char *);
+const char *ssl_cmd_SSLCARevocationPath(cmd_parms *, void *, const char *);
+const char *ssl_cmd_SSLCARevocationFile(cmd_parms *, void *, const char *);
+const char *ssl_cmd_SSLVerifyClient(cmd_parms *, void *, const char *);
+const char *ssl_cmd_SSLVerifyDepth(cmd_parms *, void *, const char *);
+const char *ssl_cmd_SSLSessionCache(cmd_parms *, void *, const char *);
+const char *ssl_cmd_SSLSessionCacheTimeout(cmd_parms *, void *, const char *);
+const char *ssl_cmd_SSLLog(cmd_parms *, void *, const char *);
+const char *ssl_cmd_SSLLogLevel(cmd_parms *, void *, const char *);
+const char *ssl_cmd_SSLProtocol(cmd_parms *, void *, const char *);
+const char *ssl_cmd_SSLOptions(cmd_parms *, void *, const char *);
+const char *ssl_cmd_SSLRequireSSL(cmd_parms *, void *);
+const char *ssl_cmd_SSLRequire(cmd_parms *, void *, const char *);
#ifdef SSL_EXPERIMENTAL_PROXY
const char *ssl_cmd_SSLProxyProtocol(cmd_parms *, char *, const char *);
const char *ssl_cmd_SSLProxyCipherSuite(cmd_parms *, char *, char *);
const char *ssl_cmd_SSLProxyMachineCertificatePath(cmd_parms *, char *, char *);
const char *ssl_cmd_SSLProxyMachineCertificateFile(cmd_parms *, char *, char *);
#endif
-#if 0 /* XXX */
/* module initialization */
-void ssl_init_Module(server_rec *, pool *);
-void ssl_init_SSLLibrary(void);
-void ssl_init_Engine(server_rec *, pool *);
-void ssl_init_TmpKeysHandle(int, server_rec *, pool *);
-void ssl_init_ConfigureServer(server_rec *, pool *, SSLSrvConfigRec *);
-void ssl_init_CheckServers(server_rec *, pool *);
+int ssl_init_Module(apr_pool_t *, apr_pool_t *, apr_pool_t *, server_rec *);
+void ssl_init_Engine(server_rec *, apr_pool_t *);
+void ssl_init_ConfigureServer(server_rec *, apr_pool_t *, apr_pool_t *, SSLSrvConfigRec *);
+void ssl_init_CheckServers(server_rec *, apr_pool_t *);
STACK_OF(X509_NAME)
- *ssl_init_FindCAList(server_rec *, pool *, char *, char *);
-void ssl_init_Child(server_rec *, pool *);
-void ssl_init_ChildKill(void *);
-void ssl_init_ModuleKill(void *);
+ *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_ModuleKill(void *data);
/* Apache API hooks */
-void ssl_hook_AddModule(module *);
-void ssl_hook_RemoveModule(module *);
-char *ssl_hook_RewriteCommand(cmd_parms *, void *, const char *);
void ssl_hook_NewConnection(conn_rec *);
void ssl_hook_TimeoutConnection(int);
-void ssl_hook_CloseConnection(conn_rec *);
+int ssl_hook_process_connection(SSLFilterRec *pRec);
+apr_status_t ssl_hook_CloseConnection(SSLFilterRec *);
int ssl_hook_Translate(request_rec *);
int ssl_hook_Auth(request_rec *);
int ssl_hook_UserCheck(request_rec *);
int ssl_callback_NewSessionCacheEntry(SSL *, SSL_SESSION *);
SSL_SESSION *ssl_callback_GetSessionCacheEntry(SSL *, unsigned char *, int, int *);
void ssl_callback_DelSessionCacheEntry(SSL_CTX *, SSL_SESSION *);
+#if SSL_LIBRARY_VERSION >= 0x00907000
+void ssl_callback_LogTracingState(const SSL *, int, int);
+#else
void ssl_callback_LogTracingState(SSL *, int, int);
+#endif
/* Session Cache Support */
-void ssl_scache_init(server_rec *, pool *);
+void ssl_scache_init(server_rec *, apr_pool_t *);
+#if 0 /* XXX */
+void ssl_scache_status_register(apr_pool_t *p);
+#endif
void ssl_scache_kill(server_rec *);
BOOL ssl_scache_store(server_rec *, UCHAR *, int, time_t, SSL_SESSION *);
SSL_SESSION *ssl_scache_retrieve(server_rec *, UCHAR *, int);
void ssl_scache_remove(server_rec *, UCHAR *, int);
void ssl_scache_expire(server_rec *);
-void ssl_scache_status(server_rec *, pool *, void (*)(char *, void *), void *);
+void ssl_scache_status(server_rec *, apr_pool_t *, void (*)(char *, void *), void *);
char *ssl_scache_id2sz(UCHAR *, int);
-void ssl_scache_dbm_init(server_rec *, pool *);
+void ssl_scache_dbm_init(server_rec *, apr_pool_t *);
void ssl_scache_dbm_kill(server_rec *);
BOOL ssl_scache_dbm_store(server_rec *, UCHAR *, int, time_t, SSL_SESSION *);
SSL_SESSION *ssl_scache_dbm_retrieve(server_rec *, UCHAR *, int);
void ssl_scache_dbm_remove(server_rec *, UCHAR *, int);
void ssl_scache_dbm_expire(server_rec *);
-void ssl_scache_dbm_status(server_rec *, pool *, void (*)(char *, void *), void *);
-void ssl_scache_shmht_init(server_rec *, pool *);
+void ssl_scache_dbm_status(server_rec *, apr_pool_t *, void (*)(char *, void *), void *);
+
+void ssl_scache_shmht_init(server_rec *, apr_pool_t *);
void ssl_scache_shmht_kill(server_rec *);
BOOL ssl_scache_shmht_store(server_rec *, UCHAR *, int, time_t, SSL_SESSION *);
SSL_SESSION *ssl_scache_shmht_retrieve(server_rec *, UCHAR *, int);
void ssl_scache_shmht_remove(server_rec *, UCHAR *, int);
void ssl_scache_shmht_expire(server_rec *);
-void ssl_scache_shmht_status(server_rec *, pool *, void (*)(char *, void *), void *);
-void ssl_scache_shmcb_init(server_rec *, pool *);
+void ssl_scache_shmht_status(server_rec *, apr_pool_t *, void (*)(char *, void *), void *);
+
+void ssl_scache_shmcb_init(server_rec *, apr_pool_t *);
void ssl_scache_shmcb_kill(server_rec *);
BOOL ssl_scache_shmcb_store(server_rec *, UCHAR *, int, time_t, SSL_SESSION *);
SSL_SESSION *ssl_scache_shmcb_retrieve(server_rec *, UCHAR *, int);
void ssl_scache_shmcb_remove(server_rec *, UCHAR *, int);
void ssl_scache_shmcb_expire(server_rec *);
-void ssl_scache_shmcb_status(server_rec *, pool *, void (*)(char *, void *), void *);
+void ssl_scache_shmcb_status(server_rec *, apr_pool_t *, void (*)(char *, void *), void *);
/* Pass Phrase Support */
-void ssl_pphrase_Handle(server_rec *, pool *);
-int ssl_pphrase_Handle_CB(char *, int, int);
+void ssl_pphrase_Handle(server_rec *, apr_pool_t *);
/* Diffie-Hellman Parameter Support */
DH *ssl_dh_GetTmpParam(int);
DH *ssl_dh_GetParamFromFile(char *);
-/* Data Structures */
-ssl_ds_array *ssl_ds_array_make(pool *, int);
-BOOL ssl_ds_array_isempty(ssl_ds_array *);
-void *ssl_ds_array_push(ssl_ds_array *);
-void *ssl_ds_array_get(ssl_ds_array *, int);
-void ssl_ds_array_wipeout(ssl_ds_array *);
-void ssl_ds_array_kill(ssl_ds_array *);
-ssl_ds_table *ssl_ds_table_make(pool *, int);
-BOOL ssl_ds_table_isempty(ssl_ds_table *);
-void *ssl_ds_table_push(ssl_ds_table *, char *);
-void *ssl_ds_table_get(ssl_ds_table *, char *);
-void ssl_ds_table_wipeout(ssl_ds_table *);
-void ssl_ds_table_kill(ssl_ds_table *);
+unsigned char *ssl_asn1_table_set(apr_hash_t *table,
+ const char *key,
+ long int length);
+ssl_asn1_t *ssl_asn1_table_get(apr_hash_t *table,
+ const char *key);
+
+void ssl_asn1_table_unset(apr_hash_t *table,
+ const char *key);
+
+const char *ssl_asn1_keystr(int keytype);
+
+const char *ssl_asn1_table_keyfmt(apr_pool_t *p,
+ const char *id,
+ int keytype);
/* Mutex Support */
-void ssl_mutex_init(server_rec *, pool *);
-void ssl_mutex_reinit(server_rec *, pool *);
-void ssl_mutex_on(server_rec *);
-void ssl_mutex_off(server_rec *);
-void ssl_mutex_kill(server_rec *s);
-void ssl_mutex_file_create(server_rec *, pool *);
-void ssl_mutex_file_open(server_rec *, pool *);
-void ssl_mutex_file_remove(void *);
-BOOL ssl_mutex_file_acquire(void);
-BOOL ssl_mutex_file_release(void);
-void ssl_mutex_sem_create(server_rec *, pool *);
-void ssl_mutex_sem_open(server_rec *, pool *);
-void ssl_mutex_sem_remove(void *);
-BOOL ssl_mutex_sem_acquire(void);
-BOOL ssl_mutex_sem_release(void);
+int ssl_mutex_init(server_rec *, apr_pool_t *);
+int ssl_mutex_reinit(server_rec *, apr_pool_t *);
+int ssl_mutex_on(server_rec *);
+int ssl_mutex_off(server_rec *);
/* Logfile Support */
-void ssl_log_open(server_rec *, server_rec *, pool *);
-BOOL ssl_log_applies(server_rec *, int);
+void ssl_log_open(server_rec *, server_rec *, apr_pool_t *);
void ssl_log(server_rec *, int, const char *, ...);
void ssl_die(void);
/* Variables */
void ssl_var_register(void);
-void ssl_var_unregister(void);
-char *ssl_var_lookup(pool *, server_rec *, conn_rec *, request_rec *, char *);
+char *ssl_var_lookup(apr_pool_t *, server_rec *, conn_rec *, request_rec *, char *);
+void ssl_var_log_config_register(apr_pool_t *p);
-/* I/O */
-void ssl_io_register(void);
-void ssl_io_unregister(void);
-long ssl_io_data_cb(BIO *, int, const char *, int, long, long);
-#ifndef SSL_CONSERVATIVE
-void ssl_io_suck(request_rec *, SSL *);
-#endif
+APR_DECLARE_OPTIONAL_FN(char *, ssl_var_lookup,
+ (apr_pool_t *, server_rec *,
+ conn_rec *, request_rec *,
+ char *));
-/* PRNG */
-int ssl_rand_seed(server_rec *, pool *, ssl_rsctx_t, char *);
+/* Proxy Extensions */
+#if 0 /* XXX */
+void ssl_ext_proxy_register(apr_pool_t *p);
+#endif /* -0- */
-/* Extensions */
-void ssl_ext_register(void);
-void ssl_ext_unregister(void);
+/* I/O */
+void ssl_io_filter_init(conn_rec *, SSL *);
+void ssl_io_filter_register(apr_pool_t *);
+long ssl_io_data_cb(BIO *, int, MODSSL_BIO_CB_ARG_TYPE *, int, long, long);
-/* Compatibility */
-#ifdef SSL_COMPAT
-char *ssl_compat_directive(server_rec *, pool *, const char *);
-void ssl_compat_variables(request_rec *);
-#endif
+/* PRNG */
+int ssl_rand_seed(server_rec *, apr_pool_t *, ssl_rsctx_t, char *);
/* Utility Functions */
-char *ssl_util_server_root_relative(pool *, char *, char *);
-char *ssl_util_vhostid(pool *, server_rec *);
+char *ssl_util_vhostid(apr_pool_t *, server_rec *);
void ssl_util_strupper(char *);
void ssl_util_uuencode(char *, const char *, BOOL);
void ssl_util_uuencode_binary(unsigned char *, const unsigned char *, int, BOOL);
-FILE *ssl_util_ppopen(server_rec *, pool *, char *);
-int ssl_util_ppopen_child(void *, child_info *);
-void ssl_util_ppclose(server_rec *, pool *, FILE *);
-char *ssl_util_readfilter(server_rec *, pool *, char *);
-BOOL ssl_util_path_check(ssl_pathcheck_t, char *);
+apr_file_t *ssl_util_ppopen(server_rec *, apr_pool_t *, const char *,
+ const char * const *);
+void ssl_util_ppclose(server_rec *, apr_pool_t *, apr_file_t *);
+char *ssl_util_readfilter(server_rec *, apr_pool_t *, const char *,
+ const char * const *);
+BOOL ssl_util_path_check(ssl_pathcheck_t, const char *, apr_pool_t *);
ssl_algo_t ssl_util_algotypeof(X509 *, EVP_PKEY *);
char *ssl_util_algotypestr(ssl_algo_t);
-char *ssl_util_ptxtsub(pool *, const char *, const char *, char *);
-void ssl_util_thread_setup(void);
-
-/* Vendor extension support */
-#if defined(SSL_VENDOR) && defined(SSL_VENDOR_OBJS)
-void ssl_vendor_register(void);
-void ssl_vendor_unregister(void);
-#endif
-
-#endif /* XXX */
+char *ssl_util_ptxtsub(apr_pool_t *, const char *, const char *, char *);
+void ssl_util_thread_setup(server_rec *, apr_pool_t *);
-#endif /* MOD_SSL_H */
+#define APR_SHM_MAXSIZE (64 * 1024 * 1024)
+#endif /* __MOD_SSL_H__ */
projects / apache / blobdiff