diff options
| author |   beck <beck@openbsd.org> | 2000-06-30 05:35:09 +0000 |
|---|---|---|
| committer | beck <beck@openbsd.org> | 2000-06-30 05:35:09 +0000 |
| commit | e8b955054c8ef9715009d4503352099ed76f5067 (patch) | |
| tree | e999b9579683ad92093aa0e6450e5b685e861cb8 /usr.sbin/httpd/src/modules/ssl/ssl_engine_init.c | |
| parent | .es kbd; from nbsd (diff) | |
| download | wireguard-openbsd-e8b955054c8ef9715009d4503352099ed76f5067.tar.xz wireguard-openbsd-e8b955054c8ef9715009d4503352099ed76f5067.zip | |
mod_ssl 2.6.4 merge
From brad@
Diffstat (limited to 'usr.sbin/httpd/src/modules/ssl/ssl_engine_init.c')
| -rw-r--r-- | usr.sbin/httpd/src/modules/ssl/ssl_engine_init.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/usr.sbin/httpd/src/modules/ssl/ssl_engine_init.c b/usr.sbin/httpd/src/modules/ssl/ssl_engine_init.c index 0b38b9a4a94..125d8c41160 100644 --- a/usr.sbin/httpd/src/modules/ssl/ssl_engine_init.c +++ b/usr.sbin/httpd/src/modules/ssl/ssl_engine_init.c @@ -151,7 +151,7 @@ void ssl_init_Module(server_rec *s, pool *p) sc->nVerifyClient = SSL_CVERIFY_NONE; if (sc->nVerifyDepth == UNSET) sc->nVerifyDepth = 1; -#ifdef SSL_EXPERIMENTAL +#ifdef SSL_EXPERIMENTAL_PROXY if (sc->nProxyVerifyDepth == UNSET) sc->nProxyVerifyDepth = 1; #endif @@ -353,10 +353,10 @@ void ssl_init_TmpKeysHandle(int action, server_rec *s, pool *p) ssl_log(s, SSL_LOG_ERROR, "Init: Failed to generate temporary 512 bit RSA private key"); #if 0 ssl_die(); -#else +#else ssl_log(s, SSL_LOG_ERROR, "Init: You probably have no RSA support in libcrypto. See ssl(8)"); return; -#endif +#endif } asn1 = (ssl_asn1_t *)ssl_ds_table_push(mc->tTmpKeys, "RSA:512"); asn1->nData = i2d_RSAPrivateKey(rsa, NULL); @@ -826,6 +826,12 @@ void ssl_init_ConfigureServer(server_rec *s, pool *p, SSLSrvConfigRec *sc) n, n == 1 ? "" : "s"); } +#ifdef SSL_VENDOR + ap_hook_use("ap::mod_ssl::vendor::configure_server", + AP_HOOK_SIG4(void,ptr,ptr,ptr), AP_HOOK_ALL, + s, p, sc); +#endif + return; } |