www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2026-01-26 19:01:35 +03:00
Code Activity
8,172 Commits 62 Branches 306 Tags
94de8923dba848c60553c4f3cd594f45875cc428
Commit Graph

2792 Commits

Author SHA1 Message Date
Doug MacEachern
1d76ab39ff breakup SSLSrvConfigRec in preparation for proxy support: 
+ 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
 2002-03-28 18:50:07 +00:00
Doug MacEachern
e90c7fb27f ripping out some proxy stuff that isn't currently in use and is going 
to change anyhow.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94266 13f79535-47bb-0310-9956-ffa450edef68
 2002-03-28 17:23:50 +00:00
Doug MacEachern
388657af76 already added configure check for SSL_set_cert_store 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94265 13f79535-47bb-0310-9956-ffa450edef68
 2002-03-28 17:16:41 +00:00
Doug MacEachern
d5c395f0e7 de-hungarian-ize server config member names which are going to stay 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94264 13f79535-47bb-0310-9956-ffa450edef68
 2002-03-28 17:11:12 +00:00
Doug MacEachern
bb986b6b22 reorder a bit of the server config structure, moving items that are 
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
 2002-03-28 16:47:36 +00:00
Jeff Trawick
8f04ed6a4d signature of quick_handler hook changed 
(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
 2002-03-28 11:17:59 +00:00
Doug MacEachern
d40a4f8d8e remove error msg hint that is no longer true 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94261 13f79535-47bb-0310-9956-ffa450edef68
 2002-03-28 02:51:52 +00:00
Doug MacEachern
5a392794c4 fixup naming: 
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
 2002-03-28 02:46:28 +00:00
Doug MacEachern
f69256ac13 move context callback setting to ssl_init_ctx_callbacks function 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94259 13f79535-47bb-0310-9956-ffa450edef68
 2002-03-28 02:40:01 +00:00
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
Brian Pane
7f7d0c040f Revert my last fix, which broke more things than it fixed 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94254 13f79535-47bb-0310-9956-ffa450edef68
 2002-03-28 01:57: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
Brian Pane
832f28d371 Don't walk past the end of the tag in ap_ssi_get_tag_and_value() 
Discovered by: Cliff Woolley


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94251 13f79535-47bb-0310-9956-ffa450edef68
 2002-03-28 01:19:58 +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
Bill Stoddard
527d4fc537 ap_run_sub_req does not return apr_status, so we shouldn't be checking 
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
 2002-03-28 01:05:24 +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
Bill Stoddard
7da34b011d Add a new parameter to the quick_handler hook to instruct 
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
 2002-03-27 22:42:16 +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
Bill Stoddard
ca9511a577 Ensure CACHE_OUT gets installed in front of SUBREQ_CORE on subrequsts. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94236 13f79535-47bb-0310-9956-ffa450edef68
 2002-03-27 21:20:37 +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
Bill Stoddard
6f05957b1a Update the MSVC++ project files. The debug databases were conficting between 
the different cache projects.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94229 13f79535-47bb-0310-9956-ffa450edef68
 2002-03-27 19:06:52 +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
Jeff Trawick
743eeb21e9 style improvement for checking whether the result of an 
assignment was NULL

Submitted by:	Sander Striker


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94220 13f79535-47bb-0310-9956-ffa450edef68
 2002-03-27 13:05:14 +00:00
Jim Jagielski
68a27728ce Depreciate mod_proxy's own CHANGES file 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94219 13f79535-47bb-0310-9956-ffa450edef68
 2002-03-27 12:55:35 +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