]>
granicus.if.org Git - apache/log
Doug MacEachern [Fri, 29 Mar 2002 04:48:01 +0000 (04:48 +0000)]
init proxy context
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94292
13f79535 -47bb-0310-9956-
ffa450edef68
Brian Pane [Fri, 29 Mar 2002 04:47:10 +0000 (04:47 +0000)]
Replaced my fix for the is_only_below() bug with Cliff's faster
and simpler version.
Submitted by: Cliff Woolley
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94291
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Fri, 29 Mar 2002 03:19:12 +0000 (03:19 +0000)]
s/id/mode/ in ssl_cmd_SSLProxyVerify
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94290
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Fri, 29 Mar 2002 03:05:49 +0000 (03:05 +0000)]
use ssl_cmd_verify_parse for SSLProxyVerify directive handler
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94289
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Fri, 29 Mar 2002 02:59:27 +0000 (02:59 +0000)]
cleanup the proxy context
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94288
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Fri, 29 Mar 2002 02:48:20 +0000 (02:48 +0000)]
s/ctx/dcfg/g in ssl directive handlers
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94287
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Fri, 29 Mar 2002 02:43:33 +0000 (02:43 +0000)]
enable proxy directives
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94286
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Fri, 29 Mar 2002 02:20:58 +0000 (02:20 +0000)]
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@94285
13f79535 -47bb-0310-9956-
ffa450edef68
Brian Pane [Fri, 29 Mar 2002 02:14:45 +0000 (02:14 +0000)]
Fixes for three problems in mod_include:
* The ctx->tag_length computation in find_end_sequence() was a bit
broken in cases where there was a "false alarm" match on a partial
"-->"
* The ap_ssi_get_tag_and_value() function needs to avoid walking off
the end of the string. After debugging this some more, I ended up
using Cliff's original patch.
* Infinite loop in is_only_below()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94284
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Fri, 29 Mar 2002 02:09:59 +0000 (02:09 +0000)]
proxy will have a different verify callback
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94283
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Fri, 29 Mar 2002 02:06:57 +0000 (02:06 +0000)]
proxy needs to use client ssl method
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94282
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Fri, 29 Mar 2002 02:01:49 +0000 (02:01 +0000)]
setup sc->proxy->sc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94281
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Fri, 29 Mar 2002 02:00:20 +0000 (02:00 +0000)]
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@94280
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Fri, 29 Mar 2002 01:56:40 +0000 (01:56 +0000)]
inititialize and merge proxy config
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94279
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Fri, 29 Mar 2002 01:42:04 +0000 (01:42 +0000)]
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@94278
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Fri, 29 Mar 2002 01:24:10 +0000 (01:24 +0000)]
'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@94277
13f79535 -47bb-0310-9956-
ffa450edef68
Bradley Nicholes [Fri, 29 Mar 2002 00:39:56 +0000 (00:39 +0000)]
Stop the while loop from incrementing twice per iteration before checking for
the NULL terminator. This was causing the while loop to walk off the end of any
string with an odd number of characters.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94276
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Thu, 28 Mar 2002 19:50:48 +0000 (19:50 +0000)]
ctx->sc is set during init
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94275
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Thu, 28 Mar 2002 19:48:31 +0000 (19:48 +0000)]
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@94274
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Thu, 28 Mar 2002 19:15:03 +0000 (19:15 +0000)]
make merging of modssl_ctx_t's generic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94273
13f79535 -47bb-0310-9956-
ffa450edef68
Joshua Slive [Thu, 28 Mar 2002 19:04:48 +0000 (19:04 +0000)]
Update Redhat layout to v7.
PR: BZ-7422
Submitted by: Joe Orton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94272
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Thu, 28 Mar 2002 18:58:06 +0000 (18:58 +0000)]
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@94271
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Thu, 28 Mar 2002 18:54:52 +0000 (18:54 +0000)]
remove unused cfgMerge{Table,Ctx} macros
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94269
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Thu, 28 Mar 2002 18:53:54 +0000 (18:53 +0000)]
moving protocol location
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94268
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Thu, 28 Mar 2002 18:50:07 +0000 (18:50 +0000)]
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@94267
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Thu, 28 Mar 2002 17:23:50 +0000 (17:23 +0000)]
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@94266
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Thu, 28 Mar 2002 17:16:41 +0000 (17:16 +0000)]
already added configure check for SSL_set_cert_store
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94265
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Thu, 28 Mar 2002 17:11:12 +0000 (17:11 +0000)]
de-hungarian-ize server config member names which are going to stay
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94264
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Thu, 28 Mar 2002 16:47:36 +0000 (16:47 +0000)]
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@94263
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 28 Mar 2002 11:17:59 +0000 (11:17 +0000)]
signature of quick_handler hook changed
(mod_example's quick_handler hook doesn't have to do anything
with the new parameter)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94262
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Thu, 28 Mar 2002 02:51:52 +0000 (02:51 +0000)]
remove error msg hint that is no longer true
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94261
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Thu, 28 Mar 2002 02:46:28 +0000 (02:46 +0000)]
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@94260
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Thu, 28 Mar 2002 02:40:01 +0000 (02:40 +0000)]
move context callback setting to ssl_init_ctx_callbacks function
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94259
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Thu, 28 Mar 2002 02:36:05 +0000 (02:36 +0000)]
move server cert/key initialization to ssl_init_server_certs function
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94258
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Thu, 28 Mar 2002 02:28:06 +0000 (02:28 +0000)]
copy DSA params to server server during key import
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94257
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Thu, 28 Mar 2002 02:09:58 +0000 (02:09 +0000)]
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@94256
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Thu, 28 Mar 2002 02:01:03 +0000 (02:01 +0000)]
fold some duplication into generic ssl_server_import_key function
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94255
13f79535 -47bb-0310-9956-
ffa450edef68
Brian Pane [Thu, 28 Mar 2002 01:57:03 +0000 (01:57 +0000)]
Revert my last fix, which broke more things than it fixed
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94254
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Thu, 28 Mar 2002 01:47:50 +0000 (01:47 +0000)]
fold some duplication into generic ssl_server_import_cert function
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94253
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Thu, 28 Mar 2002 01:32:41 +0000 (01:32 +0000)]
move server cert checking into generic ssl_check_public_cert function.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94252
13f79535 -47bb-0310-9956-
ffa450edef68
Brian Pane [Thu, 28 Mar 2002 01:19:58 +0000 (01:19 +0000)]
Don't walk past the end of the tag in ap_ssi_get_tag_and_value()
Discovered by: Cliff Woolley
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94251
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Thu, 28 Mar 2002 01:14:53 +0000 (01:14 +0000)]
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@94250
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Thu, 28 Mar 2002 01:07:20 +0000 (01:07 +0000)]
break out certificate chain initialization into
ssl_init_cert_chain function
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94249
13f79535 -47bb-0310-9956-
ffa450edef68
Bill Stoddard [Thu, 28 Mar 2002 01:05:24 +0000 (01:05 +0000)]
ap_run_sub_req does not return apr_status, so we shouldn't be checking
APR_STATUS_IS_EPIPE(). Also, remove the code that assumed the sub_req_lookup_uri
actually served up the content in the quick handler. We now call the quick_handler
in ap_run_sub_req()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94248
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Thu, 28 Mar 2002 00:34:13 +0000 (00:34 +0000)]
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@94247
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Wed, 27 Mar 2002 23:53:27 +0000 (23:53 +0000)]
break out certificate revocation list initialization into
ssl_init_crl function
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94246
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Wed, 27 Mar 2002 23:49:09 +0000 (23:49 +0000)]
break out cipher suite initialization into ssl_init_cipher_suite function
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94245
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Wed, 27 Mar 2002 23:35:31 +0000 (23:35 +0000)]
"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@94244
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Wed, 27 Mar 2002 23:25:58 +0000 (23:25 +0000)]
move warning about session cache not being configured to ssl_scache_init
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94243
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Wed, 27 Mar 2002 23:19:08 +0000 (23:19 +0000)]
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@94242
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Wed, 27 Mar 2002 22:57:47 +0000 (22:57 +0000)]
add entry for sslc compat layer changes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94241
13f79535 -47bb-0310-9956-
ffa450edef68
Bill Stoddard [Wed, 27 Mar 2002 22:42:16 +0000 (22:42 +0000)]
Add a new parameter to the quick_handler hook to instruct
quick handlers to optionally do a lookup rather than actually
serve content. This is the first of several changes required fix
several problems with how quick handlers work with subrequests.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94240
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Wed, 27 Mar 2002 22:31:33 +0000 (22:31 +0000)]
add license
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94239
13f79535 -47bb-0310-9956-
ffa450edef68
Bradley Nicholes [Wed, 27 Mar 2002 22:13:26 +0000 (22:13 +0000)]
Switched to xcopy commands in the make file so that we are sure all of the
document directories are copied during the install processing
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94238
13f79535 -47bb-0310-9956-
ffa450edef68
Bill Stoddard [Wed, 27 Mar 2002 21:20:37 +0000 (21:20 +0000)]
Ensure CACHE_OUT gets installed in front of SUBREQ_CORE on subrequsts.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94236
13f79535 -47bb-0310-9956-
ffa450edef68
Cliff Woolley [Wed, 27 Mar 2002 21:16:37 +0000 (21:16 +0000)]
"Oops" has two o's in it. :)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94235
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Wed, 27 Mar 2002 21:14:49 +0000 (21:14 +0000)]
break SSL_CTX initialization into ssl_init_ctx function
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94234
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Wed, 27 Mar 2002 21:07:08 +0000 (21:07 +0000)]
(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@94233
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 27 Mar 2002 20:37:32 +0000 (20:37 +0000)]
worker MPM:
get MaxRequestsPerChild to work again by allowing the main thread of
a child to be interrupted by one of the other threads in the process
this should get graceful termination to work after encountering one of
the various possible error conditions in the listener and worker threads
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94232
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Wed, 27 Mar 2002 19:38:05 +0000 (19:38 +0000)]
bringing back MOD_SSL_VERSION macro, define it to AP_SERVER_BASEVERSION
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94231
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Wed, 27 Mar 2002 19:11:11 +0000 (19:11 +0000)]
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@94230
13f79535 -47bb-0310-9956-
ffa450edef68
Bill Stoddard [Wed, 27 Mar 2002 19:06:52 +0000 (19:06 +0000)]
Update the MSVC++ project files. The debug databases were conficting between
the different cache projects.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94229
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Wed, 27 Mar 2002 18:46:49 +0000 (18:46 +0000)]
static-ize {write,read}tty variables
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94227
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Wed, 27 Mar 2002 18:20:37 +0000 (18:20 +0000)]
move prototype for modssl_session_get_time to ssl_util_ssl.h
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94226
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Wed, 27 Mar 2002 18:19:44 +0000 (18:19 +0000)]
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@94225
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Wed, 27 Mar 2002 17:02:56 +0000 (17:02 +0000)]
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@94223
13f79535 -47bb-0310-9956-
ffa450edef68
Bill Stoddard [Wed, 27 Mar 2002 15:30:41 +0000 (15:30 +0000)]
This might be helpful to folks readong code and reading this document to understand
how their filter should work.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94222
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 27 Mar 2002 14:24:32 +0000 (14:24 +0000)]
Document the APR change that bubbles up
to affect Apache. The default ordering of the accept metux method
has been changed to match 1.3
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94221
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 27 Mar 2002 13:05:14 +0000 (13:05 +0000)]
style improvement for checking whether the result of an
assignment was NULL
Submitted by: Sander Striker
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94220
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 27 Mar 2002 12:55:35 +0000 (12:55 +0000)]
Depreciate mod_proxy's own CHANGES file
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94219
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Wed, 27 Mar 2002 06:01:03 +0000 (06:01 +0000)]
fix doofo in last commit
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94218
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Wed, 27 Mar 2002 05:58:31 +0000 (05:58 +0000)]
sslc 1.x does not have an x509v3.h
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94217
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Wed, 27 Mar 2002 05:50:56 +0000 (05:50 +0000)]
sslc does not currently support X509V3_EXT_d2i
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94216
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Wed, 27 Mar 2002 04:02:46 +0000 (04:02 +0000)]
toolkit compat for PEM_read_bio_PrivateKey
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94215
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Wed, 27 Mar 2002 03:58:26 +0000 (03:58 +0000)]
use compat macro for another PEM_read_bio_X509
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94214
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Wed, 27 Mar 2002 03:56:02 +0000 (03:56 +0000)]
toolkit compat for PEM_read_bio_X509
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94213
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Wed, 27 Mar 2002 03:46:36 +0000 (03:46 +0000)]
adjust to another const char vs char mismatch between OpenSSL and sslc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94212
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Wed, 27 Mar 2002 03:42:21 +0000 (03:42 +0000)]
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@94211
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Wed, 27 Mar 2002 03:33:57 +0000 (03:33 +0000)]
typo fix s/EDG/EGD/g
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94210
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Wed, 27 Mar 2002 03:31:23 +0000 (03:31 +0000)]
modssl_set_cipher_list was in the wrong place for OpenSSL
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94209
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Wed, 27 Mar 2002 03:28:52 +0000 (03:28 +0000)]
RAND_status macro was in the wrong place
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94208
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Wed, 27 Mar 2002 03:27:13 +0000 (03:27 +0000)]
sslc does not currently support RAND_egd or RAND_status
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94207
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Wed, 27 Mar 2002 03:13:32 +0000 (03:13 +0000)]
in sslc PEM_F_DEF_CALLBACK == PEM_F_DEF_CB
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94206
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Wed, 27 Mar 2002 03:11:22 +0000 (03:11 +0000)]
2nd arg to SSL_set_cipher_list in sslc is char *
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94205
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Wed, 27 Mar 2002 03:09:11 +0000 (03:09 +0000)]
sslc 1.x SSL_set_verify only takes 2 args
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94204
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Wed, 27 Mar 2002 03:04:24 +0000 (03:04 +0000)]
sslc does not currently implement an SSL_set_state function
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94203
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Wed, 27 Mar 2002 03:02:10 +0000 (03:02 +0000)]
sslc adds a second, unused param to X509_verify_cert
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94202
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Wed, 27 Mar 2002 02:53:38 +0000 (02:53 +0000)]
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@94201
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Wed, 27 Mar 2002 02:50:43 +0000 (02:50 +0000)]
some compat macros for sslc 1.x
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94200
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Wed, 27 Mar 2002 02:28:15 +0000 (02:28 +0000)]
moving OpenSSL+sslc compat foo to ssl_toolkit_compat.h
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94199
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Wed, 27 Mar 2002 01:58:15 +0000 (01:58 +0000)]
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@94198
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Wed, 27 Mar 2002 01:50:43 +0000 (01:50 +0000)]
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@94197
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Wed, 27 Mar 2002 01:28:20 +0000 (01:28 +0000)]
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@94195
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Wed, 27 Mar 2002 00:46:07 +0000 (00:46 +0000)]
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@94194
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Wed, 27 Mar 2002 00:32:07 +0000 (00:32 +0000)]
configure already checks OpenSSL version so dont bother here
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94193
13f79535 -47bb-0310-9956-
ffa450edef68
Cliff Woolley [Wed, 27 Mar 2002 00:28:07 +0000 (00:28 +0000)]
Anal-retentive factor -- be consistent in our whitespace.
Reviewed by: Greg Stein
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94192
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 26 Mar 2002 20:41:11 +0000 (20:41 +0000)]
Up to .35 [no need to call out .35-dev in changes, that's just silly.]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94191
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 26 Mar 2002 20:35:51 +0000 (20:35 +0000)]
Ready for .34 evaluation.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94190
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 26 Mar 2002 20:13:37 +0000 (20:13 +0000)]
Somewhere about server/main.c rev 1.54, we lost the stop|shutdown|uninstall
when the .conf file is missing or horribly corrupt. Move those actions
into the rewrite args phase so we don't trip over a missing .conf file,
we couldn't care less if we are stopping/uninstalling Apache.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94189
13f79535 -47bb-0310-9956-
ffa450edef68
Justin Erenkrantz [Tue, 26 Mar 2002 19:43:46 +0000 (19:43 +0000)]
Ensure that the build directory is created when using VPATH.
Previously, configure would try to write config_vars.mk into build
without ensuring that that directory existed first.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94188
13f79535 -47bb-0310-9956-
ffa450edef68