]>
git.ipfire.org Git - thirdparty/apache/httpd.git/log
William A. Rowe Jr [Tue, 4 Jun 2002 02:19:33 +0000 (02:19 +0000)]
The only remaining question ... are nested or strictly unnested locks
expected by OpenSSL? Right now I've left it as _DEFAULT for the platform
preference. Very simple code really - the server_rec was superfluous.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@95497
13f79535 -47bb-0310-9956-
ffa450edef68
Cliff Woolley [Thu, 30 May 2002 22:39:08 +0000 (22:39 +0000)]
This definitely gets the award for least useful error message of the month.
Not only should it just say "can't do that on win32," which is after all
the bottom line, it was spitting out openssl error messages which were
totally useless. Eg:
[30/May/2002 17:31:17 05760] [error] Init: PassPhraseDialog BuiltIn not
supported in server private key from file
F:/Apache/Apache2/conf/ssl/secure.key (OpenSSL library error follows)
[30/May/2002 17:31:17 05760] [error] OpenSSL: error:
0D084069 :asn1
encoding routines:d2i_ASN1_SET:bad tag
[30/May/2002 17:31:17 05760] [error] OpenSSL: error:
0D09D082 :asn1
encoding routines:d2i_RSAPrivateKey:parsing
[30/May/2002 17:31:17 05760] [error] OpenSSL: error:
0D09B00D :asn1
encoding routines:d2i_PrivateKey:ASN1 lib
Which is essentially saying "OpenSSL couldn't read your private key because
it was encrypted, and we can't get the passphrase the way you asked us to
on this platform."
Brought to my attention by the inquiry of: Chris Hsiang <chsiang@ivivos.com>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@95415
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 30 May 2002 19:19:20 +0000 (19:19 +0000)]
Based on DougM's feedback to the list...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@95408
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 30 May 2002 18:50:43 +0000 (18:50 +0000)]
Apparently Roy missed this comment. Rephrase as a seperate paragraph
to more clearly split credit for OpenSSL from credit for mod_ssl.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@95407
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 30 May 2002 18:17:16 +0000 (18:17 +0000)]
Split out the LAYOUT
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@95406
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 30 May 2002 17:37:54 +0000 (17:37 +0000)]
As we find the right places for this content, move them out in bits
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@95405
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 30 May 2002 06:02:15 +0000 (06:02 +0000)]
All rather stale. Any new/remaining issues should be moved to CHANGES
in the present tense, as opposed to the "Future port to 2.0". Heh
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@95389
13f79535 -47bb-0310-9956-
ffa450edef68
Cliff Woolley [Tue, 28 May 2002 21:47:31 +0000 (21:47 +0000)]
APR-ize the localtime() fooness, since localtime() is not always
threadsafe.
PR: 9469
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@95327
13f79535 -47bb-0310-9956-
ffa450edef68
Cliff Woolley [Sat, 25 May 2002 20:10:55 +0000 (20:10 +0000)]
Fix the rest of the apr_pool_userdata_setn() bogosity w.r.t. DSO modules.
It's totally unsafe to use apr_pool_userdata_setn() in the post_config
phase of a module, since on some platforms when the DSO gets reloaded
between phases, the data segment will be at a different address on the
second phase and the userdata_get() call will fail.
PR: 9413
Submitted by: Tsuyoshi Sasamoto <nazonazo@super.win.ne.jp>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@95287
13f79535 -47bb-0310-9956-
ffa450edef68
Cliff Woolley [Mon, 20 May 2002 18:33:41 +0000 (18:33 +0000)]
propagate gregames' change to the other callers of that function
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@95189
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Fri, 17 May 2002 18:21:12 +0000 (18:21 +0000)]
prevent possible segv in ssl_init_CheckServers if s->addrs is NULL.
for example: <VirtualHost *:>, for which the core only spits out a warning:
Name or service not known: Cannot resolve host name *: --- ignoring!
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@95158
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 17 May 2002 11:24:17 +0000 (11:24 +0000)]
stop using APLOG_NOERRNO in calls to ap_log_[pr]error()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@95150
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 16 May 2002 10:45:22 +0000 (10:45 +0000)]
tweak an error message for readability
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@95135
13f79535 -47bb-0310-9956-
ffa450edef68
Justin Erenkrantz [Thu, 16 May 2002 06:09:13 +0000 (06:09 +0000)]
Remove SSLLog and SSLLogLevel directives in favor of having mod_ssl use the
standard ErrorLog directives.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@95129
13f79535 -47bb-0310-9956-
ffa450edef68
Justin Erenkrantz [Thu, 16 May 2002 05:17:11 +0000 (05:17 +0000)]
Change mod_ssl from using ssl_log() to ap_log_error().
The issue is that ssl_log doesn't handle apr_status_t result codes. This
leads to a number of places (esp. with mutexes) where the error codes get
lost. Rather than extending ssl_log further, since mod_ssl is part of
our core, migrate to ap_log_error. This means that mod_ssl no longer
does its own logging.
Most uses of SSL_ADD_ERRNO are now mapped correctly to apr_status_t values
(mainly because the APIs that used to return errnos are now APRized and
have apr_status_t codes available).
SSL_LOG_TRACE and SSL_LOG_DEBUG were mapped to the APLOG_DEBUG values.
mod_ssl prints out a LOT of debugging information, so mod_ssl with LogLevel
Debug may not be a good idea - perhaps mod_ssl should be less chatty.
Numerous printf type collisions were also resolved.
(The ssl logging code itself will be removed in a subsequent commit.)
This has been discussed on dev@httpd, but the fact that there isn't
much to review besides the mindless changes, I'm going to commit now
and rely on CTR if I screwed up anything on the translation.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@95127
13f79535 -47bb-0310-9956-
ffa450edef68
Justin Erenkrantz [Wed, 15 May 2002 23:10:33 +0000 (23:10 +0000)]
Stop using SSL_ADD_SSLERR option in ssl_log() and replace with new
ssl_log_ssl_error() function that wraps ap_log_error instead.
This begins the migration from ssl_log() -> ap_log_error(). Divorcing
ourselves from the SSL_ADD_SSLERR option is required to make the next
pass easier.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@95122
13f79535 -47bb-0310-9956-
ffa450edef68
Justin Erenkrantz [Mon, 13 May 2002 07:49:30 +0000 (07:49 +0000)]
Correct typo in last commit.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@95059
13f79535 -47bb-0310-9956-
ffa450edef68
Justin Erenkrantz [Mon, 13 May 2002 07:38:30 +0000 (07:38 +0000)]
Apply same patch (nee hack) to mod_ssl as was done to mod_rewrite to
get cross-process mutex permissions working.
This is waiting for a proper APR interface, but this does not mean that
we should remain broken in the meantime.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@95057
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 10 May 2002 03:55:41 +0000 (03:55 +0000)]
Afraid these are likely generated, just something to watch out for
in the future. Address PR 8963
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@95024
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 9 May 2002 10:53:28 +0000 (10:53 +0000)]
Fix a mod_ssl build problem on OS/390.
This is admittedly rather ugly code to come up with a unique 4-byte
identifier for the thread. Since our threads are pthreads and a pthread
maps 1:1 to a TCB, the address of the TCB is sufficient. Yes, every
TCB sees a different piece of real storage mapped to the first page,
so the code does make sense.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@95016
13f79535 -47bb-0310-9956-
ffa450edef68
Paul J. Reder [Wed, 1 May 2002 19:28:52 +0000 (19:28 +0000)]
Fix a case where an invalid pass phrase is entered and an
error message is given, but the prompt is not shown again.
This left the user in an ambiguous state.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@94896
13f79535 -47bb-0310-9956-
ffa450edef68
Cliff Woolley [Tue, 30 Apr 2002 17:10:12 +0000 (17:10 +0000)]
Revert optimization from circa 2.0.34 that caused very long vhost id's
to be unusable with mod_ssl.
PR: 8572
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@94881
13f79535 -47bb-0310-9956-
ffa450edef68
Cliff Woolley [Tue, 30 Apr 2002 06:57:22 +0000 (06:57 +0000)]
note a desirable goal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@94877
13f79535 -47bb-0310-9956-
ffa450edef68
Cliff Woolley [Tue, 30 Apr 2002 06:48:45 +0000 (06:48 +0000)]
SHMCB should not have been using apr_rmm -- it was doing so incorrectly,
for one thing. But it just plain doesn't need it. Rip it out to avoid
segfaulting.
Submitted by: Aaron Bannert
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@94876
13f79535 -47bb-0310-9956-
ffa450edef68
Cliff Woolley [Tue, 30 Apr 2002 03:47:31 +0000 (03:47 +0000)]
- Sync with modssl 2.8.8-1.3.24
- Also a minor change to add more useful error
logging for shmcb startup failures
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@94875
13f79535 -47bb-0310-9956-
ffa450edef68
Justin Erenkrantz [Thu, 18 Apr 2002 08:45:34 +0000 (08:45 +0000)]
Fix so that we can compile with OpenSSL 0.9.8-dev.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@94696
13f79535 -47bb-0310-9956-
ffa450edef68
Sander Striker [Sat, 13 Apr 2002 12:02:38 +0000 (12:02 +0000)]
Adapt to the rename of apr_explode_localtime to apr_time_exp_lt in APR.
Submitted by: Thom May <thom@planetarytramp.net>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@94631
13f79535 -47bb-0310-9956-
ffa450edef68
Cliff Woolley [Fri, 12 Apr 2002 17:46:09 +0000 (17:46 +0000)]
Touch these files so that their datestamps are newer than the corresponding
.y and .l files. These must be kept newer than those at all times to avoid
introducing a dependency on flex and yacc.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@94623
13f79535 -47bb-0310-9956-
ffa450edef68
Aaron Bannert [Tue, 9 Apr 2002 15:53:09 +0000 (15:53 +0000)]
Convert mod_ssl to the new apr_global_mutex.h API and remove all
uses of apr_lock.h [deprecated]. Tested that I could serve simple
SSL (v3) pages.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@94583
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Mon, 8 Apr 2002 19:07:58 +0000 (19:07 +0000)]
another todo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@94547
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Sun, 7 Apr 2002 21:58:25 +0000 (21:58 +0000)]
PR: 7802
Obtained from:
Submitted by:
Reviewed by:
fix compilation problem in ssl_engine_kernel.c
if SSL_LIBRARY_VERSION >= 0x00907000
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@94527
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Sun, 7 Apr 2002 06:32:21 +0000 (06:32 +0000)]
PR:
Obtained from:
Submitted by:
Reviewed by:
ssl_io_input_read now returns APR_EOF if ssl_io_hook_read returns 0
bytes for a reason other than SSL_ERROR_WANT_READ. this should
prevent a possible endless loop.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@94519
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Sun, 7 Apr 2002 03:37:35 +0000 (03:37 +0000)]
fix ProxyPass when frontend is https and backend is http
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@94515
13f79535 -47bb-0310-9956-
ffa450edef68
Cliff Woolley [Fri, 5 Apr 2002 07:31:44 +0000 (07:31 +0000)]
Get the HTTP-on-HTTPS hint to come through again. We're in AP_MODE_GETLINE
at this point, so the \r\n\r\n just confuses the http input filter.
One concern: this patch is only correct as long as we only ever call this
function while in AP_MODE_GETLINE. Ideally we would account for the mode
and return the newlines if not in GETLINE mode, but at the moment it doesn't
seem to matter.
Reviewed by: Doug MacEachern
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@94453
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Fri, 5 Apr 2002 02:31:04 +0000 (02:31 +0000)]
PR:
Obtained from:
Submitted by:
Reviewed by:
avoid the error_log message: [error] mod_ssl: Certificate Verification: Error ...
if SSLProxyVerify is not configured or set to "none".
the verify callback does not happen in the server context when
SSLVerify is not configured or set to "none".
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@94444
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Tue, 2 Apr 2002 22:07:09 +0000 (22:07 +0000)]
fix SSL_X509_INFO_load_path so SSLProxyMachineCertificatePath works
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@94406
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Tue, 2 Apr 2002 21:57:31 +0000 (21:57 +0000)]
copy-n-pasto: need to use SSL_X509_INFO_load_*path* on pkp->cert_path
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@94405
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Tue, 2 Apr 2002 21:56:12 +0000 (21:56 +0000)]
copy-n-pasto: ssl_cmd_SSLProxyMachineCertificatePath needs to set cert_path
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@94404
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Tue, 2 Apr 2002 21:32:35 +0000 (21:32 +0000)]
fix copy-n-pasto: ssl_cmd_SSLProxyCACertificatePath needs to use
ssl_cmd_check_dir rather than ssl_cmd_check_file
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@94403
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Tue, 2 Apr 2002 20:53:17 +0000 (20:53 +0000)]
another todo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@94400
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Tue, 2 Apr 2002 17:30:08 +0000 (17:30 +0000)]
PR:
Obtained from:
Submitted by:
Reviewed by: Ryan Bloom
ap_remove_output_filter no longer works for connection filters.
change logic in the case of "HTTP spoken on HTTPS port" to disable the
ssl filters rather than attempt to remove the filters.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@94393
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Tue, 2 Apr 2002 17:23:41 +0000 (17:23 +0000)]
various updates
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@94392
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Sat, 30 Mar 2002 08:11:44 +0000 (08:11 +0000)]
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
Doug MacEachern [Sat, 30 Mar 2002 07:42:30 +0000 (07:42 +0000)]
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
Doug MacEachern [Sat, 30 Mar 2002 06:46:24 +0000 (06:46 +0000)]
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
Doug MacEachern [Sat, 30 Mar 2002 06:38:10 +0000 (06:38 +0000)]
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
Doug MacEachern [Sat, 30 Mar 2002 06:36:56 +0000 (06:36 +0000)]
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
Doug MacEachern [Sat, 30 Mar 2002 06:20:16 +0000 (06:20 +0000)]
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
Doug MacEachern [Sat, 30 Mar 2002 06:03:08 +0000 (06:03 +0000)]
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
Doug MacEachern [Sat, 30 Mar 2002 05:57:59 +0000 (05:57 +0000)]
add myCtxConfig macro
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@94331
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Sat, 30 Mar 2002 05:40:02 +0000 (05:40 +0000)]
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
Doug MacEachern [Sat, 30 Mar 2002 05:16:55 +0000 (05:16 +0000)]
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
Doug MacEachern [Sat, 30 Mar 2002 04:52:48 +0000 (04:52 +0000)]
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
Doug MacEachern [Sat, 30 Mar 2002 01:50:10 +0000 (01:50 +0000)]
load SSLProxyMachineCertificate{File,Path}
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@94324
13f79535 -47bb-0310-9956-
ffa450edef68
Doug MacEachern [Sat, 30 Mar 2002 01:41:35 +0000 (01:41 +0000)]
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
Cliff Woolley [Sat, 30 Mar 2002 00:00:21 +0000 (00:00 +0000)]
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
Doug MacEachern [Fri, 29 Mar 2002 17:56:33 +0000 (17:56 +0000)]
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
Cliff Woolley [Fri, 29 Mar 2002 08:17:26 +0000 (08:17 +0000)]
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
Doug MacEachern [Fri, 29 Mar 2002 07:37:28 +0000 (07:37 +0000)]
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
Doug MacEachern [Fri, 29 Mar 2002 07:36:01 +0000 (07:36 +0000)]
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
Doug MacEachern [Fri, 29 Mar 2002 07:23:09 +0000 (07:23 +0000)]
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
Doug MacEachern [Fri, 29 Mar 2002 07:22:43 +0000 (07:22 +0000)]
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
Cliff Woolley [Fri, 29 Mar 2002 07:12:01 +0000 (07:12 +0000)]
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
Doug MacEachern [Fri, 29 Mar 2002 04:50:37 +0000 (04:50 +0000)]
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
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/modules/ssl@94292
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/modules/ssl@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/modules/ssl@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/modules/ssl@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/modules/ssl@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/modules/ssl@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/modules/ssl@94285
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/modules/ssl@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/modules/ssl@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/modules/ssl@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/modules/ssl@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/modules/ssl@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/modules/ssl@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/modules/ssl@94277
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/modules/ssl@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/modules/ssl@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/modules/ssl@94273
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/modules/ssl@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/modules/ssl@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/modules/ssl@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/modules/ssl@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/modules/ssl@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/modules/ssl@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/modules/ssl@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/modules/ssl@94263
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/modules/ssl@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/modules/ssl@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/modules/ssl@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/modules/ssl@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/modules/ssl@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/modules/ssl@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/modules/ssl@94255
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/modules/ssl@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/modules/ssl@94252
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/modules/ssl@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/modules/ssl@94249
13f79535 -47bb-0310-9956-
ffa450edef68