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

Mar 29, 2002

Fixes for three problems in mod_include: · b3476178

Brian Pane authored Mar 29, 2002

  * 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

b3476178

proxy will have a different verify callback · c85866ce

Doug MacEachern authored Mar 29, 2002


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

c85866ce

proxy needs to use client ssl method · 7f3d430b

Doug MacEachern authored Mar 29, 2002


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

7f3d430b

setup sc->proxy->sc · 0c428711

Doug MacEachern authored Mar 29, 2002


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

0c428711

add ssl_config_server_new function to fold some duplication in server · 761375c6

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

761375c6

inititialize and merge proxy config · d0a70383

Doug MacEachern authored Mar 29, 2002


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

d0a70383

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

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

d348e627

'ctx' traditionally refers to an SSL_CTX. change modssl_ctx_t · 29db7053

Doug MacEachern authored Mar 29, 2002

instances to 'mctx'


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

29db7053

Stop the while loop from incrementing twice per iteration before checking for · 91c2758c

Bradley Nicholes authored Mar 29, 2002

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

91c2758c

Mar 28, 2002

ctx->sc is set during init · 36be4423

Doug MacEachern authored Mar 28, 2002


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

36be4423

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

Mar 27, 2002
- 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