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

27 Mar, 2002 33 commits

break SSL_CTX initialization into ssl_init_ctx function · e9f642b2

Doug MacEachern authored Mar 27, 2002


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

e9f642b2

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

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/modules/ssl@94233 13f79535-47bb-0310-9956-ffa450edef68

cf652ddb

bringing back MOD_SSL_VERSION macro, define it to AP_SERVER_BASEVERSION · 07ca859d
Doug MacEachern authored Mar 27, 2002
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@94231 13f79535-47bb-0310-9956-ffa450edef68
```
07ca859d

adjustment for sslc where its PEM_read_bio_PrivateKey does not take a · 95682a68

Doug MacEachern authored Mar 27, 2002

callback arg.


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

95682a68

static-ize {write,read}tty variables · 2b937ed7

Doug MacEachern authored Mar 27, 2002


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

2b937ed7

move prototype for modssl_session_get_time to ssl_util_ssl.h · 27f069da

Doug MacEachern authored Mar 27, 2002


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

27f069da

add modssl_dh_configure() function to fold some duplication in · 4f8cb727

Doug MacEachern authored Mar 27, 2002

get_dh{512,1024} and provide toolkit compat for sslc 2.x


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

4f8cb727

add configure checks for ssl functions: · 8dfac3f4

Doug MacEachern authored Mar 27, 2002

-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/modules/ssl@94223 13f79535-47bb-0310-9956-ffa450edef68

8dfac3f4

fix doofo in last commit · 5e72a431

Doug MacEachern authored Mar 27, 2002


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

5e72a431

sslc 1.x does not have an x509v3.h · 8df0be2e

Doug MacEachern authored Mar 27, 2002


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

8df0be2e

sslc does not currently support X509V3_EXT_d2i · 8308f273

Doug MacEachern authored Mar 27, 2002


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

8308f273

toolkit compat for PEM_read_bio_PrivateKey · d282836f

Doug MacEachern authored Mar 27, 2002


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

d282836f

use compat macro for another PEM_read_bio_X509 · e5b2f72e

Doug MacEachern authored Mar 27, 2002


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

e5b2f72e

toolkit compat for PEM_read_bio_X509 · 27c58f59

Doug MacEachern authored Mar 27, 2002


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

27c58f59

adjust to another const char vs char mismatch between OpenSSL and sslc · cfb98546
Doug MacEachern authored Mar 27, 2002
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@94212 13f79535-47bb-0310-9956-ffa450edef68
```
cfb98546
use SSL_SESSION_ api since SSL_SESSION cannot be dereferenced when using sslc · a4e1ce7d
Doug MacEachern authored Mar 27, 2002
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@94211 13f79535-47bb-0310-9956-ffa450edef68
```
a4e1ce7d

typo fix s/EDG/EGD/g · 2a263ee1

Doug MacEachern authored Mar 27, 2002


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

2a263ee1

modssl_set_cipher_list was in the wrong place for OpenSSL · 4d985795

Doug MacEachern authored Mar 27, 2002


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

4d985795

RAND_status macro was in the wrong place · 253975ee

Doug MacEachern authored Mar 27, 2002


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

253975ee

sslc does not currently support RAND_egd or RAND_status · d04b4412

Doug MacEachern authored Mar 27, 2002


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

d04b4412

in sslc PEM_F_DEF_CALLBACK == PEM_F_DEF_CB · 384f7f0e

Doug MacEachern authored Mar 27, 2002


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

384f7f0e

2nd arg to SSL_set_cipher_list in sslc is char * · b7f3c7ce

Doug MacEachern authored Mar 27, 2002


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

b7f3c7ce

sslc 1.x SSL_set_verify only takes 2 args · adce0fe1

Doug MacEachern authored Mar 27, 2002


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

adce0fe1

sslc does not currently implement an SSL_set_state function · b320c3bb

Doug MacEachern authored Mar 27, 2002


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

b320c3bb

sslc adds a second, unused param to X509_verify_cert · 3f5fc56c

Doug MacEachern authored Mar 27, 2002


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

3f5fc56c

sslc does not have a safestack.h, implement a minimal subset required · 85e8f419

Doug MacEachern authored Mar 27, 2002

for mod_ssl


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

85e8f419

some compat macros for sslc 1.x · 66560904

Doug MacEachern authored Mar 27, 2002


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

66560904

moving OpenSSL+sslc compat foo to ssl_toolkit_compat.h · aa5a93b4

Doug MacEachern authored Mar 27, 2002


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

aa5a93b4

3rd arg of BIO callbacks in 'const char' in OpenSSL and 'char' in sslc, · f62cdb59

Doug MacEachern authored Mar 27, 2002

make both happy.


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

f62cdb59

OpenSSL uses void * for callback data, sslc uses char *, · 035f027d

Doug MacEachern authored Mar 27, 2002

cast to void * to make both happy.


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

035f027d

add modssl_session_get_time() function to give mod_ssl what it needs · 77b5a643

Doug MacEachern authored Mar 27, 2002

from SSL_SESSION_get_time() if using OpenSSL or sslc.


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

77b5a643

another step towards compatiblity with rsa sslc: · 26fcfc75

Doug MacEachern authored Mar 27, 2002

define the STACK_OF macro if not already defined.


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

26fcfc75

configure already checks OpenSSL version so dont bother here · e2b7201c

Doug MacEachern authored Mar 27, 2002


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

e2b7201c

26 Mar, 2002 7 commits

note about the temporary DH keys · c1bf8746

Doug MacEachern authored Mar 26, 2002


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

c1bf8746

a few updates · 378fa86c

Doug MacEachern authored Mar 26, 2002


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

378fa86c

per-dir SSLCACertificate{File,Path} cannot use SSL_CTX_set_cert_store · bc1ecd89

Doug MacEachern authored Mar 26, 2002

as the 1.x based module does, since the function is not thread-safe.
a patch has been submitted to OpenSSL to support SSL_set_cert_store
which is thread safe. this feature is enabled by default in the
current 1.x based module, we only enable it if the SSL_set_cert_store
function is available.

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

bc1ecd89

constificationization of some char * config items · b6898259

Doug MacEachern authored Mar 26, 2002


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

b6898259

performance enhancement: mod_ssl config directives that can have both · 0dfe80db

Doug MacEachern authored Mar 26, 2002

a per-server and per-dir context were configuring the per-dir context
for per-server commands. this triggered ssl_hook_Access to always
compare the per-server context against per-dir configs that were
exactly the same.

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

0dfe80db

correct comment in previous change · e46017ab

Doug MacEachern authored Mar 26, 2002


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

e46017ab

· 2aaf1bc5

Doug MacEachern authored Mar 26, 2002

PR:
Obtained from:
Submitted by:
Reviewed by:
fix bug seen on win32 with netscape client where output filter is run
triggered by lingering_close after ssl_hook_CloseConnection has been called


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

2aaf1bc5