add/use EVP_PKEY_reference_inc and X509_reference_inc compat macros
to get these changes working with sslc

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

add sslc compat for sk_X509_INFO_free

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

add SSLProxyCARevocation{File,Path} directives to support CRLs in the proxy

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

pass sc to myCtxConfig macro

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

make it possible for proxy to use CRL callback

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

enable the verify callback for proxy

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

change sc->server references to myCtxConfig, so proxy can use the
verify callback.

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

add myCtxConfig macro

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

implement proxy client certificate callback
(uses SSLProxyMachineCertificate{File,Cert} when downstream server
requires a client certificate)

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

input filter should not return failure when ssl runtime wants to read more

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

ssl_io_input_read needs to return something other than APR_SUCCESS
when bucket read from socket was successful,
but there was an error within the ssl runtime.

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

load SSLProxyMachineCertificate{File,Path}

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

enable/cleanup SSL_X509_INFO_load_{file,path} functions for use in
proxy context

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

Fix the version string.  We want to end up with "mod_ssl/2.0.xx", not
"mod_ssl/Apache/2.0.xx".

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

add SSLProxyEngine directive.  this was not required in the 1.x based
mod_ssl because the SSL_CTX was created and configured for *every*
request.  unlike in 2.0 where we configure the proxy SSL_CTX at
startup time, which is much better for performance.  but we don't want
to configure a proxy context for every vhost if it isn't going to be
used, for the same reasons we don't create a server context for every
vhost unless SSLEngine is on.

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

BUCKET FREELISTS

Add an allocator-passing mechanism throughout the bucket brigades API.

From Apache's standpoint, the apr_bucket_alloc_t* used throughout a given
connection is stored in the conn_rec by the create_connection hook.  That
means it's the MPM's job to optimize recycling of apr_bucket_alloc_t's --
the MPM must ensure that no two threads can ever use the same one at the
same time, for instance.

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

remove ssl_engine_ext.c

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

removing old proxy extension code

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

need to flush output buffer before reading in proxy mode

need to call ssl_hook_process_connection in the output filter in proxy
mode, since proxy hits the output filter before the input filter

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

in proxy mode we need to SSL_connect rather than SSL_accept in
ssl_hook_process_connection.

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

These two variables were left uninitialized accidentally.

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

add optional function (ssl_proxy_enable) to turn on ssl proxy

choose SSL_CTX based on SSLConnRec.is_proxy

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

init proxy context

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

s/id/mode/ in ssl_cmd_SSLProxyVerify

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

use ssl_cmd_verify_parse for SSLProxyVerify directive handler

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

cleanup the proxy context

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

s/ctx/dcfg/g in ssl directive handlers

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

enable proxy directives

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

change existing ssl_init_ctx() to ssl_init_ctx_protocol()

new ssl_init_ctx() inits the lot: protocol, session_cache, callbacks,
verify, cipher suite, crl, cert_chain

new ssl_init_server_ctx function inits everything for sc->server

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

proxy will have a different verify callback

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

proxy needs to use client ssl method

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

setup sc->proxy->sc

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

add ssl_config_server_new function to fold some duplication in server
create/merge and to make sure merge config is fully inititialized

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

inititialize and merge proxy config

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

no point in merging things which are not set until after merge happens.
make a note of those which are set during module init.

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

'ctx' traditionally refers to an SSL_CTX.  change modssl_ctx_t
instances to 'mctx'

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

ctx->sc is set during init

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

switch from SSLSrvConfigRec* to modssl_ctx_t* in the ssl_init_ctx*
functions

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

make merging of modssl_ctx_t's generic

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

moving cfgMerge macros to ssl_engine_config.c, they are not used anywhere else

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

remove unused cfgMerge{Table,Ctx} macros

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

moving protocol location

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

breakup SSLSrvConfigRec in preparation for proxy support:
+ modssl_pk_server_t - certs/keys for the server
+ modssl_pk_proxy_t  - certs/keys for the proxy
+ modssl_auth_ctx_t  - stuff related to authentication that can also
                       be per-dir, used by both server and proxy
+ modssl_ctx_t       - context that can be used by both server and proxy
+ SSLSrvConfigRec    - now contains original stuff specific to the
                       server config and modssl_ctx_t *server, *proxy

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

ripping out some proxy stuff that isn't currently in use and is going
to change anyhow.

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

already added configure check for SSL_set_cert_store

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

de-hungarian-ize server config member names which are going to stay

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

reorder a bit of the server config structure, moving items that are
going to stay there to the top.

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

remove error msg hint that is no longer true

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

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

move context callback setting to ssl_init_ctx_callbacks function

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

move server cert/key initialization to ssl_init_server_certs function

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

copy DSA params to server server during key import

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

fix logic from last commit, need to always try importing _both_ rsa
and dsa

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

fold some duplication into generic ssl_server_import_key function

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

fold some duplication into generic ssl_server_import_cert function

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

move server cert checking into generic ssl_check_public_cert function.

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

move server specific init config checks into ssl_init_check_server
function (ssl_init_check_proxy will be different)

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

break out certificate chain initialization into
ssl_init_cert_chain function

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

there is a heaping pile of:
 ssl_log(s, flags, "Init: (%s) ...", sc->szVHostID)
add SSL_INIT flag to cut down some noise and end up with:
 ssl_log(s, flags, "...")

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

break out certificate revocation list initialization into
ssl_init_crl function

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

break out cipher suite initialization into ssl_init_cipher_suite function

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

"new" is a c++ keyword; s/new/mrg/g in config merge functions

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

move warning about session cache not being configured to ssl_scache_init

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

break out SSL_CTX session initialization into
ssl_init_session_cache_ctx function

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

add license

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

"Oops" has two o's in it.  :)

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

break SSL_CTX initialization into ssl_init_ctx function

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

(starting to break apart the init code into smaller, generic functions,
preparing for proxy support)

break out verify code into ssl_init_verify function.

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

bringing back MOD_SSL_VERSION macro, define it to AP_SERVER_BASEVERSION

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

adjustment for sslc where its PEM_read_bio_PrivateKey does not take a
callback arg.

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

static-ize {write,read}tty variables

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

move prototype for modssl_session_get_time to ssl_util_ssl.h

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

add modssl_dh_configure() function to fold some duplication in
get_dh{512,1024} and provide toolkit compat for sslc 2.x

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

add configure checks for ssl functions:
-SSL_set_state: macro in OpenSSL, might be a function in a patched sslc
-SSL_set_cert_store: patch submitted to OpenSSL, might be applied to
OpenSSL or sslc

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

fix doofo in last commit

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

sslc 1.x does not have an x509v3.h

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

sslc does not currently support X509V3_EXT_d2i

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

toolkit compat for PEM_read_bio_PrivateKey

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

use compat macro for another PEM_read_bio_X509

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

toolkit compat for PEM_read_bio_X509

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

adjust to another const char vs char mismatch between OpenSSL and sslc

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

use SSL_SESSION_ api since SSL_SESSION cannot be dereferenced when using sslc

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

typo fix s/EDG/EGD/g

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

modssl_set_cipher_list was in the wrong place for OpenSSL

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

RAND_status macro was in the wrong place

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

sslc does not currently support RAND_egd or RAND_status

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

in sslc PEM_F_DEF_CALLBACK == PEM_F_DEF_CB

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

2nd arg to SSL_set_cipher_list in sslc is char *

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

sslc 1.x SSL_set_verify only takes 2 args

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

sslc does not currently implement an SSL_set_state function

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

sslc adds a second, unused param to X509_verify_cert

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

sslc does not have a safestack.h, implement a minimal subset required
for mod_ssl

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

some compat macros for sslc 1.x

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

moving OpenSSL+sslc compat foo to ssl_toolkit_compat.h

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

3rd arg of BIO callbacks in 'const char' in OpenSSL and 'char' in sslc,
make both happy.

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

OpenSSL uses void * for callback data, sslc uses char *,
cast to void * to make both happy.

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

add modssl_session_get_time() function to give mod_ssl what it needs
from SSL_SESSION_get_time() if using OpenSSL or sslc.

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

another step towards compatiblity with rsa sslc:
define the STACK_OF macro if not already defined.

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

configure already checks OpenSSL version so dont bother here

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

note about the temporary DH keys

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