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

28 Mar, 2002 27 commits

switch from SSLSrvConfigRec* to modssl_ctx_t* in the ssl_init_ctx* · f4ad8d6e
Doug MacEachern authored Mar 28, 2002
```
functions


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

make merging of modssl_ctx_t's generic · 9f2fa437

Doug MacEachern authored Mar 28, 2002


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

9f2fa437

Update Redhat layout to v7. · 5cfc8bf5

Joshua Slive authored Mar 28, 2002

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

5cfc8bf5

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

remove unused cfgMerge{Table,Ctx} macros · 024da1f0

Doug MacEachern authored Mar 28, 2002


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

024da1f0

moving protocol location · fd8db8f8

Doug MacEachern authored Mar 28, 2002


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

fd8db8f8

breakup SSLSrvConfigRec in preparation for proxy support: · 22ae53e9

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@94267 13f79535-47bb-0310-9956-ffa450edef68

22ae53e9

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

Doug MacEachern authored Mar 28, 2002

to change anyhow.


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

9f702848

already added configure check for SSL_set_cert_store · 82ed99d6

Doug MacEachern authored Mar 28, 2002


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

82ed99d6

de-hungarian-ize server config member names which are going to stay · 6e4857fe
Doug MacEachern authored Mar 28, 2002
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94264 13f79535-47bb-0310-9956-ffa450edef68
```
6e4857fe

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

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@94263 13f79535-47bb-0310-9956-ffa450edef68

f60af32f

signature of quick_handler hook changed · f6bccb9e

Jeff Trawick authored Mar 28, 2002

(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

f6bccb9e

remove error msg hint that is no longer true · e9cd278b

Doug MacEachern authored Mar 28, 2002


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

e9cd278b

fixup naming: · bd15f176

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@94260 13f79535-47bb-0310-9956-ffa450edef68

bd15f176

move context callback setting to ssl_init_ctx_callbacks function · 5d653fde
Doug MacEachern authored Mar 28, 2002
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94259 13f79535-47bb-0310-9956-ffa450edef68
```
5d653fde
move server cert/key initialization to ssl_init_server_certs function · 57a7b128
Doug MacEachern authored Mar 28, 2002
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94258 13f79535-47bb-0310-9956-ffa450edef68
```
57a7b128

copy DSA params to server server during key import · 6f1a6075

Doug MacEachern authored Mar 28, 2002


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

6f1a6075

fix logic from last commit, need to always try importing _both_ rsa · c2ec26cf
Doug MacEachern authored Mar 28, 2002
```
and dsa


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94256 13f79535-47bb-0310-9956-ffa450edef68
```
c2ec26cf
fold some duplication into generic ssl_server_import_key function · 3b689599
Doug MacEachern authored Mar 28, 2002
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94255 13f79535-47bb-0310-9956-ffa450edef68
```
3b689599

Revert my last fix, which broke more things than it fixed · ea785484

Brian Pane authored Mar 28, 2002


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

ea785484

fold some duplication into generic ssl_server_import_cert function · b1ce032e
Doug MacEachern authored Mar 28, 2002
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94253 13f79535-47bb-0310-9956-ffa450edef68
```
b1ce032e
move server cert checking into generic ssl_check_public_cert function. · 7af8b95c
Doug MacEachern authored Mar 28, 2002
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94252 13f79535-47bb-0310-9956-ffa450edef68
```
7af8b95c

Don't walk past the end of the tag in ap_ssi_get_tag_and_value() · a63a8be3

Brian Pane authored Mar 28, 2002

Discovered by: Cliff Woolley


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

a63a8be3

move server specific init config checks into ssl_init_check_server · 9cf8225f

Doug MacEachern authored Mar 28, 2002

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

9cf8225f

break out certificate chain initialization into · 2f7a6085

Doug MacEachern authored Mar 28, 2002

ssl_init_cert_chain function


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

2f7a6085

ap_run_sub_req does not return apr_status, so we shouldn't be checking · 74753ee9

Bill Stoddard authored Mar 28, 2002

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

74753ee9

there is a heaping pile of: · 4eb1aadd

Doug MacEachern authored Mar 28, 2002

 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

4eb1aadd

27 Mar, 2002 13 commits

break out certificate revocation list initialization into · 3ed3905c

Doug MacEachern authored Mar 27, 2002

ssl_init_crl function


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

3ed3905c

break out cipher suite initialization into ssl_init_cipher_suite function · fbe2dc50
Doug MacEachern authored Mar 27, 2002
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94245 13f79535-47bb-0310-9956-ffa450edef68
```
fbe2dc50
"new" is a c++ keyword; s/new/mrg/g in config merge functions · 949afd19
Doug MacEachern authored Mar 27, 2002
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94244 13f79535-47bb-0310-9956-ffa450edef68
```
949afd19
move warning about session cache not being configured to ssl_scache_init · 05d86805
Doug MacEachern authored Mar 27, 2002
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94243 13f79535-47bb-0310-9956-ffa450edef68
```
05d86805

break out SSL_CTX session initialization into · 83bcc795

Doug MacEachern authored Mar 27, 2002

ssl_init_session_cache_ctx function


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

83bcc795

add entry for sslc compat layer changes · bb1a7e85

Doug MacEachern authored Mar 27, 2002


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

bb1a7e85

Add a new parameter to the quick_handler hook to instruct · 2c99d4bc

Bill Stoddard authored Mar 27, 2002

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

2c99d4bc

add license · d512b0b1

Doug MacEachern authored Mar 27, 2002


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

d512b0b1

Switched to xcopy commands in the make file so that we are sure all of the · 312b22b2

Bradley Nicholes authored Mar 27, 2002

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

312b22b2

Ensure CACHE_OUT gets installed in front of SUBREQ_CORE on subrequsts. · bc4cc84d
Bill Stoddard authored Mar 27, 2002
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94236 13f79535-47bb-0310-9956-ffa450edef68
```
bc4cc84d

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

Cliff Woolley authored Mar 27, 2002


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

5704ea17

break SSL_CTX initialization into ssl_init_ctx function · 09aa85c2

Doug MacEachern authored Mar 27, 2002


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

09aa85c2

(starting to break apart the init code into smaller, generic functions, · 46fcb2e8

Doug MacEachern authored Mar 27, 2002

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

46fcb2e8