Commits · a7c4e3656f09ec7ad1b89152d162e05679ef7a52 · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP Apache Httpd

30 Mar, 2002 1 commit

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

Cliff Woolley authored Mar 30, 2002

"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

a7c4e365

29 Mar, 2002 22 commits

add SSLProxyEngine directive. this was not required in the 1.x based · 03a77177

Doug MacEachern authored Mar 29, 2002

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

03a77177

BUCKET FREELISTS · 6e9eab8b

Cliff Woolley authored Mar 29, 2002

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

6e9eab8b

remove ssl_engine_ext.c · 8baeb249

Doug MacEachern authored Mar 29, 2002


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

8baeb249

removing old proxy extension code · db5a70f6

Doug MacEachern authored Mar 29, 2002


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

db5a70f6

need to flush output buffer before reading in proxy mode · 0c954617

Doug MacEachern authored Mar 29, 2002

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

0c954617

in proxy mode we need to SSL_connect rather than SSL_accept in · 03c4691c

Doug MacEachern authored Mar 29, 2002

ssl_hook_process_connection.


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

03c4691c

These two variables were left uninitialized accidentally. · c9013c1e

Cliff Woolley authored Mar 29, 2002


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

c9013c1e

add optional function (ssl_proxy_enable) to turn on ssl proxy · cf720bbb

Doug MacEachern authored Mar 29, 2002

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

cf720bbb

init proxy context · a169e0a8

Doug MacEachern authored Mar 29, 2002


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

a169e0a8

s/id/mode/ in ssl_cmd_SSLProxyVerify · 623c0f41

Doug MacEachern authored Mar 29, 2002


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

623c0f41

use ssl_cmd_verify_parse for SSLProxyVerify directive handler · b4254e2e

Doug MacEachern authored Mar 29, 2002


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

b4254e2e

cleanup the proxy context · 695e8b39

Doug MacEachern authored Mar 29, 2002


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

695e8b39

s/ctx/dcfg/g in ssl directive handlers · df4a1739

Doug MacEachern authored Mar 29, 2002


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

df4a1739

enable proxy directives · 9b4db043

Doug MacEachern authored Mar 29, 2002


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

9b4db043

change existing ssl_init_ctx() to ssl_init_ctx_protocol() · 14c88786

Doug MacEachern authored Mar 29, 2002

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

14c88786

proxy will have a different verify callback · f8c45bef

Doug MacEachern authored Mar 29, 2002


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

f8c45bef

proxy needs to use client ssl method · c0f1b6af

Doug MacEachern authored Mar 29, 2002


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

c0f1b6af

setup sc->proxy->sc · 3773b3f7

Doug MacEachern authored Mar 29, 2002


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

3773b3f7

add ssl_config_server_new function to fold some duplication in server · d89cb0ba

Doug MacEachern authored Mar 29, 2002

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

d89cb0ba

inititialize and merge proxy config · e92b4452

Doug MacEachern authored Mar 29, 2002


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

e92b4452

no point in merging things which are not set until after merge happens. · 0a67e0db

Doug MacEachern authored Mar 29, 2002

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

0a67e0db

'ctx' traditionally refers to an SSL_CTX. change modssl_ctx_t · fd421139

Doug MacEachern authored Mar 29, 2002

instances to 'mctx'


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

fd421139

28 Mar, 2002 17 commits

ctx->sc is set during init · c0a165b4

Doug MacEachern authored Mar 28, 2002


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

c0a165b4

switch from SSLSrvConfigRec* to modssl_ctx_t* in the ssl_init_ctx* · bf56d059

Doug MacEachern authored Mar 28, 2002

functions


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

bf56d059

make merging of modssl_ctx_t's generic · ad2c8edd

Doug MacEachern authored Mar 28, 2002


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

ad2c8edd

moving cfgMerge macros to ssl_engine_config.c, they are not used anywhere else · e1602b91
Doug MacEachern authored Mar 28, 2002
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@94271 13f79535-47bb-0310-9956-ffa450edef68
```
e1602b91

remove unused cfgMerge{Table,Ctx} macros · c8123b1a

Doug MacEachern authored Mar 28, 2002


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

c8123b1a

moving protocol location · 23dde5c3

Doug MacEachern authored Mar 28, 2002


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

23dde5c3

breakup SSLSrvConfigRec in preparation for proxy support: · 04628fdb

Doug MacEachern authored Mar 28, 2002

+ 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

04628fdb

ripping out some proxy stuff that isn't currently in use and is going · e0864dce

Doug MacEachern authored Mar 28, 2002

to change anyhow.


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

e0864dce

already added configure check for SSL_set_cert_store · 2b4ceab2

Doug MacEachern authored Mar 28, 2002


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

2b4ceab2

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

Doug MacEachern authored Mar 28, 2002


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

02b0d358

reorder a bit of the server config structure, moving items that are · d117dc31

Doug MacEachern authored Mar 28, 2002

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

d117dc31

remove error msg hint that is no longer true · 61fae7c8

Doug MacEachern authored Mar 28, 2002


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

61fae7c8

fixup naming: · c912ba8b

Doug MacEachern authored Mar 28, 2002

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

c912ba8b

move context callback setting to ssl_init_ctx_callbacks function · 6d02b2d2

Doug MacEachern authored Mar 28, 2002


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

6d02b2d2

move server cert/key initialization to ssl_init_server_certs function · c9bdd500
Doug MacEachern authored Mar 28, 2002
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@94258 13f79535-47bb-0310-9956-ffa450edef68
```
c9bdd500

copy DSA params to server server during key import · d7e013e4

Doug MacEachern authored Mar 28, 2002


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

d7e013e4

fix logic from last commit, need to always try importing _both_ rsa · d2770578

Doug MacEachern authored Mar 28, 2002

and dsa


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

d2770578