Doug MacEachern
972e8bdafe
move server cert/key initialization to ssl_init_server_certs function
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94258 13f79535-47bb-0310-9956-ffa450edef68
2002-03-28 02:36:05 +00:00
Doug MacEachern
44f93970ac
copy DSA params to server server during key import
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94257 13f79535-47bb-0310-9956-ffa450edef68
2002-03-28 02:28:06 +00:00
Doug MacEachern
0a76ba100d
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@94256 13f79535-47bb-0310-9956-ffa450edef68
2002-03-28 02:09:58 +00:00
Doug MacEachern
1712e063a9
fold some duplication into generic ssl_server_import_key function
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94255 13f79535-47bb-0310-9956-ffa450edef68
2002-03-28 02:01:03 +00:00
Doug MacEachern
b63b80acf5
fold some duplication into generic ssl_server_import_cert function
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94253 13f79535-47bb-0310-9956-ffa450edef68
2002-03-28 01:47:50 +00:00
Doug MacEachern
886376b4cb
move server cert checking into generic ssl_check_public_cert function.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94252 13f79535-47bb-0310-9956-ffa450edef68
2002-03-28 01:32:41 +00:00
Doug MacEachern
e6f3b17fd0
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@94250 13f79535-47bb-0310-9956-ffa450edef68
2002-03-28 01:14:53 +00:00
Doug MacEachern
52d5e83027
break out certificate chain initialization into
...
ssl_init_cert_chain function
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94249 13f79535-47bb-0310-9956-ffa450edef68
2002-03-28 01:07:20 +00:00
Doug MacEachern
249519625c
there is a heaping pile of:
...
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
2002-03-28 00:34:13 +00:00
Doug MacEachern
934bb7f29b
break out certificate revocation list initialization into
...
ssl_init_crl function
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94246 13f79535-47bb-0310-9956-ffa450edef68
2002-03-27 23:53:27 +00:00
Doug MacEachern
a413cb6798
break out cipher suite initialization into ssl_init_cipher_suite function
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94245 13f79535-47bb-0310-9956-ffa450edef68
2002-03-27 23:49:09 +00:00
Doug MacEachern
8bf48c5959
"new" is a c++ keyword; s/new/mrg/g in config merge functions
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94244 13f79535-47bb-0310-9956-ffa450edef68
2002-03-27 23:35:31 +00:00
Doug MacEachern
20ae69adba
move warning about session cache not being configured to ssl_scache_init
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94243 13f79535-47bb-0310-9956-ffa450edef68
2002-03-27 23:25:58 +00:00
Doug MacEachern
9379b72632
break out SSL_CTX session initialization into
...
ssl_init_session_cache_ctx function
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94242 13f79535-47bb-0310-9956-ffa450edef68
2002-03-27 23:19:08 +00:00
Doug MacEachern
030ac064a5
add license
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94239 13f79535-47bb-0310-9956-ffa450edef68
2002-03-27 22:31:33 +00:00
Cliff Woolley
af9bfbb2b3
"Oops" has two o's in it. :)
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94235 13f79535-47bb-0310-9956-ffa450edef68
2002-03-27 21:16:37 +00:00
Doug MacEachern
948cab95a4
break SSL_CTX initialization into ssl_init_ctx function
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94234 13f79535-47bb-0310-9956-ffa450edef68
2002-03-27 21:14:49 +00:00
Doug MacEachern
bbd6a5e76f
(starting to break apart the init code into smaller, generic functions,
...
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
2002-03-27 21:07:08 +00:00
Doug MacEachern
f3e92e1cde
bringing back MOD_SSL_VERSION macro, define it to AP_SERVER_BASEVERSION
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94231 13f79535-47bb-0310-9956-ffa450edef68
2002-03-27 19:38:05 +00:00
Doug MacEachern
309a7b6e84
adjustment for sslc where its PEM_read_bio_PrivateKey does not take a
...
callback arg.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94230 13f79535-47bb-0310-9956-ffa450edef68
2002-03-27 19:11:11 +00:00
Doug MacEachern
367fcf3016
static-ize {write,read}tty variables
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94227 13f79535-47bb-0310-9956-ffa450edef68
2002-03-27 18:46:49 +00:00
Doug MacEachern
b425a0f8c4
move prototype for modssl_session_get_time to ssl_util_ssl.h
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94226 13f79535-47bb-0310-9956-ffa450edef68
2002-03-27 18:20:37 +00:00
Doug MacEachern
72518a3153
add modssl_dh_configure() function to fold some duplication in
...
get_dh{512,1024} and provide toolkit compat for sslc 2.x
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94225 13f79535-47bb-0310-9956-ffa450edef68
2002-03-27 18:19:44 +00:00
Doug MacEachern
aeb7f9eb0b
add configure checks for ssl functions:
...
-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@94223 13f79535-47bb-0310-9956-ffa450edef68
2002-03-27 17:02:56 +00:00
Doug MacEachern
1a827bfe96
fix doofo in last commit
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94218 13f79535-47bb-0310-9956-ffa450edef68
2002-03-27 06:01:03 +00:00
Doug MacEachern
33922c86be
sslc 1.x does not have an x509v3.h
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94217 13f79535-47bb-0310-9956-ffa450edef68
2002-03-27 05:58:31 +00:00
Doug MacEachern
979adbad8a
sslc does not currently support X509V3_EXT_d2i
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94216 13f79535-47bb-0310-9956-ffa450edef68
2002-03-27 05:50:56 +00:00
Doug MacEachern
c88a192813
toolkit compat for PEM_read_bio_PrivateKey
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94215 13f79535-47bb-0310-9956-ffa450edef68
2002-03-27 04:02:46 +00:00
Doug MacEachern
c1211133a5
use compat macro for another PEM_read_bio_X509
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94214 13f79535-47bb-0310-9956-ffa450edef68
2002-03-27 03:58:26 +00:00
Doug MacEachern
9614067815
toolkit compat for PEM_read_bio_X509
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94213 13f79535-47bb-0310-9956-ffa450edef68
2002-03-27 03:56:02 +00:00
Doug MacEachern
0f2dbb97e8
adjust to another const char vs char mismatch between OpenSSL and sslc
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94212 13f79535-47bb-0310-9956-ffa450edef68
2002-03-27 03:46:36 +00:00
Doug MacEachern
e848b9b7e9
use SSL_SESSION_ api since SSL_SESSION cannot be dereferenced when using sslc
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94211 13f79535-47bb-0310-9956-ffa450edef68
2002-03-27 03:42:21 +00:00
Doug MacEachern
5b74033b80
typo fix s/EDG/EGD/g
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94210 13f79535-47bb-0310-9956-ffa450edef68
2002-03-27 03:33:57 +00:00
Doug MacEachern
20ed127171
modssl_set_cipher_list was in the wrong place for OpenSSL
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94209 13f79535-47bb-0310-9956-ffa450edef68
2002-03-27 03:31:23 +00:00
Doug MacEachern
49e69c7029
RAND_status macro was in the wrong place
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94208 13f79535-47bb-0310-9956-ffa450edef68
2002-03-27 03:28:52 +00:00
Doug MacEachern
008b963af9
sslc does not currently support RAND_egd or RAND_status
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94207 13f79535-47bb-0310-9956-ffa450edef68
2002-03-27 03:27:13 +00:00
Doug MacEachern
fecf892d82
in sslc PEM_F_DEF_CALLBACK == PEM_F_DEF_CB
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94206 13f79535-47bb-0310-9956-ffa450edef68
2002-03-27 03:13:32 +00:00
Doug MacEachern
e6392769aa
2nd arg to SSL_set_cipher_list in sslc is char *
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94205 13f79535-47bb-0310-9956-ffa450edef68
2002-03-27 03:11:22 +00:00
Doug MacEachern
66419ef565
sslc 1.x SSL_set_verify only takes 2 args
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94204 13f79535-47bb-0310-9956-ffa450edef68
2002-03-27 03:09:11 +00:00
Doug MacEachern
642262e204
sslc does not currently implement an SSL_set_state function
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94203 13f79535-47bb-0310-9956-ffa450edef68
2002-03-27 03:04:24 +00:00
Doug MacEachern
7f4a6ff760
sslc adds a second, unused param to X509_verify_cert
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94202 13f79535-47bb-0310-9956-ffa450edef68
2002-03-27 03:02:10 +00:00
Doug MacEachern
11cf72871b
sslc does not have a safestack.h, implement a minimal subset required
...
for mod_ssl
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94201 13f79535-47bb-0310-9956-ffa450edef68
2002-03-27 02:53:38 +00:00
Doug MacEachern
2eefae08bd
some compat macros for sslc 1.x
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94200 13f79535-47bb-0310-9956-ffa450edef68
2002-03-27 02:50:43 +00:00
Doug MacEachern
1d2a39531c
moving OpenSSL+sslc compat foo to ssl_toolkit_compat.h
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94199 13f79535-47bb-0310-9956-ffa450edef68
2002-03-27 02:28:15 +00:00
Doug MacEachern
5bfe936911
3rd arg of BIO callbacks in 'const char' in OpenSSL and 'char' in sslc,
...
make both happy.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94198 13f79535-47bb-0310-9956-ffa450edef68
2002-03-27 01:58:15 +00:00
Doug MacEachern
22c5fe3f27
OpenSSL uses void * for callback data, sslc uses char *,
...
cast to void * to make both happy.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94197 13f79535-47bb-0310-9956-ffa450edef68
2002-03-27 01:50:43 +00:00
Doug MacEachern
ebe92b6f8b
add modssl_session_get_time() function to give mod_ssl what it needs
...
from SSL_SESSION_get_time() if using OpenSSL or sslc.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94195 13f79535-47bb-0310-9956-ffa450edef68
2002-03-27 01:28:20 +00:00
Doug MacEachern
0fb13a8b4a
another step towards compatiblity with rsa sslc:
...
define the STACK_OF macro if not already defined.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94194 13f79535-47bb-0310-9956-ffa450edef68
2002-03-27 00:46:07 +00:00
Doug MacEachern
d37bf62cd7
configure already checks OpenSSL version so dont bother here
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94193 13f79535-47bb-0310-9956-ffa450edef68
2002-03-27 00:32:07 +00:00
Doug MacEachern
1c430e2df7
note about the temporary DH keys
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94181 13f79535-47bb-0310-9956-ffa450edef68
2002-03-26 17:29:36 +00:00