]> git.ipfire.org Git - thirdparty/apache/httpd.git/log
thirdparty/apache/httpd.git
23 years agoUpdate our copyright for this year.
Roy T. Fielding [Wed, 13 Mar 2002 20:48:07 +0000 (20:48 +0000)] 
Update our copyright for this year.

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

23 years agouse ssl_asn1_keystr
Doug MacEachern [Wed, 13 Mar 2002 18:59:56 +0000 (18:59 +0000)] 
use ssl_asn1_keystr

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

23 years agoadd ssl_asn1_keystr() util function that returns string representation
Doug MacEachern [Wed, 13 Mar 2002 18:56:07 +0000 (18:56 +0000)] 
add ssl_asn1_keystr() util function that returns string representation
(RSA or DSA) of the key index.

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

23 years agouse ssl_asn1_table_keyfmt() function and only format each (rsa,dsa)
Doug MacEachern [Wed, 13 Mar 2002 18:51:35 +0000 (18:51 +0000)] 
use ssl_asn1_table_keyfmt() function and only format each (rsa,dsa)
lookup key once, rather than twice.

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

23 years agouse ssl_asn1_table_keyfmt() function
Doug MacEachern [Wed, 13 Mar 2002 18:50:17 +0000 (18:50 +0000)] 
use ssl_asn1_table_keyfmt() function

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

23 years agoadd ssl_asn1_table_keyfmt() function for clarity
Doug MacEachern [Wed, 13 Mar 2002 18:42:05 +0000 (18:42 +0000)] 
add ssl_asn1_table_keyfmt() function for clarity

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

23 years agoPR:
Doug MacEachern [Wed, 13 Mar 2002 17:09:51 +0000 (17:09 +0000)] 
PR:
Obtained from:
Submitted by:   Madhusudan Mathihalli <madhusudan_mathihalli@hp.com>
Reviewed by: dougm
adjust to SSL_SESSION_id2sz() prototype change

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

23 years agogeneralize session logging into ssl_session_log() function
Doug MacEachern [Wed, 13 Mar 2002 17:02:45 +0000 (17:02 +0000)] 
generalize session logging into ssl_session_log() function

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

23 years agoSSL_SESSION_id2sz() was NOT THREAD SAFE. it returned a pointer to a
Doug MacEachern [Wed, 13 Mar 2002 06:41:46 +0000 (06:41 +0000)] 
SSL_SESSION_id2sz() was NOT THREAD SAFE.  it returned a pointer to a
static variable.  fixed.

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

23 years agoSSL_SESSION_id2sz() is somewhat expensive, make sure we only call it
Doug MacEachern [Wed, 13 Mar 2002 06:12:24 +0000 (06:12 +0000)] 
SSL_SESSION_id2sz() is somewhat expensive, make sure we only call it
if SSLLogLevel >= info

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

23 years agocleanup logging of CRL, includes ridding of some malloc/frees
Doug MacEachern [Wed, 13 Mar 2002 05:30:43 +0000 (05:30 +0000)] 
cleanup logging of CRL, includes ridding of some malloc/frees

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

23 years agocouple o minor style/log fixos
Doug MacEachern [Wed, 13 Mar 2002 05:05:51 +0000 (05:05 +0000)] 
couple o minor style/log fixos

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

23 years agouse ptemp in ssl_init_FindCAList() rather than creating a subpool.
Doug MacEachern [Wed, 13 Mar 2002 04:59:19 +0000 (04:59 +0000)] 
use ptemp in ssl_init_FindCAList() rather than creating a subpool.

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

23 years agoswitch to ptemp pool for ssl_pphrase_Handle
Doug MacEachern [Wed, 13 Mar 2002 04:49:23 +0000 (04:49 +0000)] 
switch to ptemp pool for ssl_pphrase_Handle

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

23 years agoonly call: ssl_rand_seed(s, p, SSL_RSCTX_STARTUP, "Init: ");
Doug MacEachern [Wed, 13 Mar 2002 04:38:35 +0000 (04:38 +0000)] 
only call: ssl_rand_seed(s, p, SSL_RSCTX_STARTUP, "Init: ");

once at startup.  if there is value in calling it more than once at
startup, it should be done explicitly rather than hidden in
ssl_tmp_keys_init().

switch to ptemp pool when calling ssl_rand_seed() at startup.

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

23 years agoremove ssl_engine_ds.c
Doug MacEachern [Wed, 13 Mar 2002 04:16:11 +0000 (04:16 +0000)] 
remove ssl_engine_ds.c

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

23 years agoremove obsolete ssl_ds_{table,array} api
Doug MacEachern [Wed, 13 Mar 2002 04:14:43 +0000 (04:14 +0000)] 
remove obsolete ssl_ds_{table,array} api

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

23 years agoreplace ssl_ds_array usage with apr_array_header_t
Doug MacEachern [Wed, 13 Mar 2002 03:59:43 +0000 (03:59 +0000)] 
replace ssl_ds_array usage with apr_array_header_t

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

23 years agominor ssl_init_CheckServers() enhancements:
Doug MacEachern [Wed, 13 Mar 2002 01:15:14 +0000 (01:15 +0000)] 
minor ssl_init_CheckServers() enhancements:
- pass the ptemp (temporary pool) so we don't need to create a subpool
  and destroy it ourselves.

- change ssl_ds_table usage to apr_hash_t

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

23 years agofolding more duplication in ssl_tmp_keys_init
Doug MacEachern [Wed, 13 Mar 2002 00:50:13 +0000 (00:50 +0000)] 
folding more duplication in ssl_tmp_keys_init

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

23 years agocleanup tmp key callbacks. each had assigned the same (1024 bit) value
Doug MacEachern [Tue, 12 Mar 2002 23:42:53 +0000 (23:42 +0000)] 
cleanup tmp key callbacks.  each had assigned the same (1024 bit) value
in 3 different places.  the old code did nothing special in the case
of the export flag either.

add an ssl_log in each to trace when keys are being handed out.

add some XXX comments.

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

23 years agofor the sake of readablity,
Doug MacEachern [Tue, 12 Mar 2002 23:05:33 +0000 (23:05 +0000)] 
for the sake of readablity,
change: SSL_TKPIDX_{DH,RSA}{512,1024}
to:     SSL_TMP_KEY_{DH,RSA}_{512,1024}

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

23 years agosplit ssl_init_TmpKeysHandle function to init/free functions,
Doug MacEachern [Tue, 12 Mar 2002 22:50:38 +0000 (22:50 +0000)] 
split ssl_init_TmpKeysHandle function to init/free functions,
and make them static to ssl_engine_init.c

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

23 years agoit is not required that temporary keys survive restarts, since they
Doug MacEachern [Tue, 12 Mar 2002 22:34:31 +0000 (22:34 +0000)] 
it is not required that temporary keys survive restarts, since they
are generated and destroyed on every restart.

so get rid of SSLModConfigRec.tTmpKeys table and mess that was
managing it.

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

23 years agoremove version checks for using EGD
Doug MacEachern [Tue, 12 Mar 2002 22:11:51 +0000 (22:11 +0000)] 
remove version checks for using EGD

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

23 years agoremove call to legacy X509V3_add_standard_extensions() function,
Doug MacEachern [Tue, 12 Mar 2002 22:08:23 +0000 (22:08 +0000)] 
remove call to legacy X509V3_add_standard_extensions() function,
not needed with OpenSSL 0.9.6+

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

23 years agowe require OpenSSL 0.9.6+
Doug MacEachern [Tue, 12 Mar 2002 22:07:12 +0000 (22:07 +0000)] 
we require OpenSSL 0.9.6+

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

23 years agoremoving unused ssl_init_ChildKill
Doug MacEachern [Tue, 12 Mar 2002 21:54:27 +0000 (21:54 +0000)] 
removing unused ssl_init_ChildKill

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

23 years agomaking ssl_init_SSLLibrary() static
Doug MacEachern [Tue, 12 Mar 2002 21:53:44 +0000 (21:53 +0000)] 
making ssl_init_SSLLibrary() static

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

23 years agocleanup version component construction.
Doug MacEachern [Tue, 12 Mar 2002 21:48:48 +0000 (21:48 +0000)] 
cleanup version component construction.

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

23 years agofold duplication of SSL{Proxy}VerifyDepth directives into
Doug MacEachern [Tue, 12 Mar 2002 21:12:49 +0000 (21:12 +0000)] 
fold duplication of SSL{Proxy}VerifyDepth directives into
ssl_cmd_verify_depth_parse function.

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

23 years agoFixed a type mismatch
Bradley Nicholes [Tue, 12 Mar 2002 21:10:18 +0000 (21:10 +0000)] 
Fixed a type mismatch

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

23 years agomoving SSLVerifyClient directive parsing into ssl_cmd_verify_parse
Doug MacEachern [Tue, 12 Mar 2002 21:06:17 +0000 (21:06 +0000)] 
moving SSLVerifyClient directive parsing into ssl_cmd_verify_parse
function, which can also be used for SSLProxyVerify directive.

dropping support for undocumented integer form of levels (0..3)

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

23 years agoAdded NetWare to the ifdef list
Bradley Nicholes [Tue, 12 Mar 2002 21:05:37 +0000 (21:05 +0000)] 
Added NetWare to the ifdef list

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

23 years agofold duplication of SSL{Proxy}Protocol directives into
Doug MacEachern [Tue, 12 Mar 2002 19:47:16 +0000 (19:47 +0000)] 
fold duplication of SSL{Proxy}Protocol directives into
ssl_cmd_protocol_parse function.

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

23 years agofold some duplication of server certs/keys directive checking into
Doug MacEachern [Tue, 12 Mar 2002 19:02:22 +0000 (19:02 +0000)] 
fold some duplication of server certs/keys directive checking into
ssl_cmd_check_aidx_max function.

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

23 years agofolding some command handler duplication into two generic functions:
Doug MacEachern [Tue, 12 Mar 2002 18:34:19 +0000 (18:34 +0000)] 
folding some command handler duplication into two generic functions:
ssl_cmd_check_file and ssl_cmd_check_dir.

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

23 years agoget rid of some warnings for currently unused/unprototyped functions.
Doug MacEachern [Tue, 12 Mar 2002 17:27:40 +0000 (17:27 +0000)] 
get rid of some warnings for currently unused/unprototyped functions.
(we can actually compile mod_ssl with -Werror if -Wstrict-prototypes
is taken out)

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

23 years agominor performance enhancement: no need to use md5 of VHostID for the
Doug MacEachern [Tue, 12 Mar 2002 16:55:56 +0000 (16:55 +0000)] 
minor performance enhancement: no need to use md5 of VHostID for the
session id, just use the VHostID itself.

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

23 years agodropping hungarian notation
Doug MacEachern [Tue, 12 Mar 2002 16:50:44 +0000 (16:50 +0000)] 
dropping hungarian notation

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

23 years agominor style changes
Doug MacEachern [Tue, 12 Mar 2002 16:44:18 +0000 (16:44 +0000)] 
minor style changes

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

23 years agodropping hungarian notation
Doug MacEachern [Tue, 12 Mar 2002 04:41:57 +0000 (04:41 +0000)] 
dropping hungarian notation

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

23 years agovarious style fixups / general changes to make code more readable.
Doug MacEachern [Tue, 12 Mar 2002 01:40:02 +0000 (01:40 +0000)] 
various style fixups / general changes to make code more readable.

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

23 years agovarious style fixups / general changes to make code more readable.
Doug MacEachern [Tue, 12 Mar 2002 01:04:16 +0000 (01:04 +0000)] 
various style fixups / general changes to make code more readable.

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

23 years agoadd SSL_VERIFY_PEER_STRICT shortcut for often used flags
Doug MacEachern [Tue, 12 Mar 2002 00:06:06 +0000 (00:06 +0000)] 
add SSL_VERIFY_PEER_STRICT shortcut for often used flags

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

23 years agovarious style fixups / general changes to make code more readable.
Doug MacEachern [Tue, 12 Mar 2002 00:05:18 +0000 (00:05 +0000)] 
various style fixups / general changes to make code more readable.

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

23 years agono need to call SSL_clear() after SSL_new()
Doug MacEachern [Sun, 10 Mar 2002 00:29:49 +0000 (00:29 +0000)] 
no need to call SSL_clear() after SSL_new()

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

23 years agodon't allocate SSLConnRec unless ssl is enabled on this vhost.
Doug MacEachern [Sun, 10 Mar 2002 00:22:07 +0000 (00:22 +0000)] 
don't allocate SSLConnRec unless ssl is enabled on this vhost.
also provides a shorter shortcut for mod_ssl hooks to decline if ssl
is not enabled.

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

23 years agosupport reuse of encrypted DSA keys on restart
Doug MacEachern [Fri, 8 Mar 2002 18:16:41 +0000 (18:16 +0000)] 
support reuse of encrypted DSA keys on restart

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

23 years agoremove unused ap_server_ctx member from SSLSrvConfigRec
Doug MacEachern [Fri, 8 Mar 2002 00:03:50 +0000 (00:03 +0000)] 
remove unused ap_server_ctx member from SSLSrvConfigRec

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

23 years agoapr-utils rename apr_ansi_time_to_apr_time and
Ian Holsman [Wed, 6 Mar 2002 17:55:38 +0000 (17:55 +0000)] 
apr-utils rename apr_ansi_time_to_apr_time and
apr_exploded_time_t.

PR:
Obtained from:
Submitted by: Thom May <thom@planetarytramp.net>
Reviewed by: Ian Holsman

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

23 years agoreuse existing private key if possible for all SSLPassPhraseDialog
Doug MacEachern [Sun, 3 Mar 2002 00:46:07 +0000 (00:46 +0000)] 
reuse existing private key if possible for all SSLPassPhraseDialog
types, not just builtin.  on win32 for example, a pipe dialog might
allocate a wintty for prompting, which results in 4 prompts at
startup, 2 for each child and 2 within each when httpd "restarts
itself".
update comments on this and wrap them a bit.

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

23 years agos/const void/const char/g in ssl_asn1_table api
Doug MacEachern [Fri, 1 Mar 2002 05:24:06 +0000 (05:24 +0000)] 
s/const void/const char/g in ssl_asn1_table api
pointed out by gstein

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

23 years agoConsensus is that we should not use the scoreboard as a source of entropy.
Cliff Woolley [Fri, 1 Mar 2002 04:35:17 +0000 (04:35 +0000)] 
Consensus is that we should not use the scoreboard as a source of entropy.

Reviewed by: OtherBill, Justin, Madhu

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

23 years agoplug leak in newish ssl_asn1_table_set() function
Doug MacEachern [Thu, 28 Feb 2002 19:11:31 +0000 (19:11 +0000)] 
plug leak in newish ssl_asn1_table_set() function

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

23 years agoremove an XXX: we already do CRYPTO_set_locking_callback() in ssl_util_thread_setup()
Doug MacEachern [Thu, 28 Feb 2002 05:58:49 +0000 (05:58 +0000)] 
remove an XXX: we already do CRYPTO_set_locking_callback() in ssl_util_thread_setup()

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

23 years agoremove #ifdef SHARED_MODULE around ssl library cleanup calls.
Doug MacEachern [Thu, 28 Feb 2002 05:28:43 +0000 (05:28 +0000)] 
remove #ifdef SHARED_MODULE around ssl library cleanup calls.
SHARED_MODULE is no longer defined, so we were leaking.
plus we always do a full startup/teardown regardless of being a dso or
static.

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

23 years agomove SSL_load_client_CA_file() comment to where we moved the call to it
Doug MacEachern [Thu, 28 Feb 2002 05:22:56 +0000 (05:22 +0000)] 
move SSL_load_client_CA_file() comment to where we moved the call to it

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

23 years agovarious SSLCACertificatePath fixes:
Doug MacEachern [Thu, 28 Feb 2002 05:17:03 +0000 (05:17 +0000)] 
various SSLCACertificatePath fixes:
- return value from apr_dir_read() was checking != APR_SUCCESS rather
  than == APR_SUCCESS, so no certs were ever loaded.

- wasn't checking return value of apr_dir_open(), now log an error and
  ssl_die() on failure.

- don't bother trying to load directories

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

23 years agoplug leak in ssl_init_FindCAList() where return value of
Doug MacEachern [Thu, 28 Feb 2002 04:59:07 +0000 (04:59 +0000)] 
plug leak in ssl_init_FindCAList() where return value of
X509_NAME_oneline() used for trace logging was not freed.
now passes in a static buffer so no buffer is malloced.

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

23 years agofold some duplication within ssl_init_FindCAList() into generic
Doug MacEachern [Thu, 28 Feb 2002 04:35:29 +0000 (04:35 +0000)] 
fold some duplication within ssl_init_FindCAList() into generic
ssl_init_PushCAList() function.

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

23 years agoneed to free X509_NAME duplicates already found in the stack built by
Doug MacEachern [Thu, 28 Feb 2002 04:00:51 +0000 (04:00 +0000)] 
need to free X509_NAME duplicates already found in the stack built by
ssl_init_FindCAList().

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

23 years agoneed to free the stacks returned by calls to SSL_load_client_CA_file()
Doug MacEachern [Thu, 28 Feb 2002 03:48:26 +0000 (03:48 +0000)] 
need to free the stacks returned by calls to SSL_load_client_CA_file()
in ssl_init_FindCAList().  values are pushed into another stack which
gets freed when SSL context is destroyed.

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

23 years agocontrary to what comments say, DH* returned from ssl_dh_GetTmpParam()
Doug MacEachern [Thu, 28 Feb 2002 03:21:51 +0000 (03:21 +0000)] 
contrary to what comments say, DH* returned from ssl_dh_GetTmpParam()
is _not_ static and needs to be freed via DH_free().

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

23 years agoneed to free sc->pRevocationStore at shutdown
Doug MacEachern [Thu, 28 Feb 2002 03:12:11 +0000 (03:12 +0000)] 
need to free sc->pRevocationStore at shutdown

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

23 years agoalways reusing existing private key for given vhost on restarts if key
Doug MacEachern [Thu, 28 Feb 2002 01:47:26 +0000 (01:47 +0000)] 
always reusing existing private key for given vhost on restarts if key
is encrypted and mtime stamp has not changed.  this prevents getting
prompted twice for passphrase on windows and elsewhere when server is
started with -DNO_DETACH.

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

23 years agos/asn1->mtime/asn1->source_mtime/
Doug MacEachern [Thu, 28 Feb 2002 01:41:42 +0000 (01:41 +0000)] 
s/asn1->mtime/asn1->source_mtime/

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

23 years agoinitialize ssl_asn1_t.mtime to 0
Doug MacEachern [Thu, 28 Feb 2002 01:36:04 +0000 (01:36 +0000)] 
initialize ssl_asn1_t.mtime to 0

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

23 years agoreuse vhost keys for asn1 tables where keys are allocated out
Doug MacEachern [Thu, 28 Feb 2002 01:30:18 +0000 (01:30 +0000)] 
reuse vhost keys for asn1 tables where keys are allocated out
of s->process->pool to prevent "leaking" each time we format
a vhost key.

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

23 years agoswitch SSLModConfigRec.tPublicCert to ssl_asn1_table api to prevent
Doug MacEachern [Thu, 28 Feb 2002 00:28:05 +0000 (00:28 +0000)] 
switch SSLModConfigRec.tPublicCert to ssl_asn1_table api to prevent
leakage on restarts.

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

23 years agoswitch SSLModConfigRec.tPrivateKey to ssl_asn1_table api to prevent
Doug MacEachern [Thu, 28 Feb 2002 00:23:32 +0000 (00:23 +0000)] 
switch SSLModConfigRec.tPrivateKey to ssl_asn1_table api to prevent
leakage on restarts.

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

23 years agoadd ssl_asn1_table_get() wrapper and change ssl_init_TmpKeysHandle()
Doug MacEachern [Thu, 28 Feb 2002 00:10:52 +0000 (00:10 +0000)] 
add ssl_asn1_table_get() wrapper and change ssl_init_TmpKeysHandle()
to use it.

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

23 years agomod_ssl was "leaking" on restart since mc->tTmpKeys table entries
Doug MacEachern [Thu, 28 Feb 2002 00:01:57 +0000 (00:01 +0000)] 
mod_ssl was "leaking" on restart since mc->tTmpKeys table entries
were allocated using apr_palloc out of s->process->pool and pushed
into an apr_array_header_t.
solve the problem by moving from apr_array_header_t's to an apr_hash_t.
also add ssl_asn1_table_{set,unset} wrappers to use malloc/free so we
do not "leak" from s->process->pool.

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

23 years ago Introduce PassPhraseDialog 'pipe' mechanism. This builds on DougM's
William A. Rowe Jr [Wed, 27 Feb 2002 19:54:07 +0000 (19:54 +0000)] 
  Introduce PassPhraseDialog 'pipe' mechanism.  This builds on DougM's
  apr-ization of the 'tty', and changes his naming a bit so we clearly
  identify the pipe-to and pipe-from the user.

  This patch invokes a bidirectional piped dialog to the user.

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

23 years ago Introduce the PassPhraseDialog 'pipe' mechanism.
William A. Rowe Jr [Wed, 27 Feb 2002 19:51:33 +0000 (19:51 +0000)] 
  Introduce the PassPhraseDialog 'pipe' mechanism.

  This is the directive handling commit only, the mechanics patch will
  follow.  PassPhraseDialog "|/path/to/pipe" will use the bidirectional
  pipe to have a 'conversation', along the lines of the tty dialog with
  PassPhraseDialog 'builtin'.  This is entirely different than the 'exec'
  method, which simply runs once for each passphrase, and doesn't allow
  for failure/retries, and certainly doesn't offer any sensible 'dialog'.

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

23 years agochange builtin passphrase prompt to use stdout rather than stderr.
Doug MacEachern [Wed, 27 Feb 2002 03:33:38 +0000 (03:33 +0000)] 
change builtin passphrase prompt to use stdout rather than stderr.
and switch to using apr_file api for portability.
stderr has already been redirected to the error_log.
rather than attempting to temporarily rehook it to the terminal,
we print the prompt to stdout before EVP_read_pw_string turns
off tty echo.  which is also more portable.

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

23 years agochanging mod_ssl to do a full startup/teardown on each restart rather
Doug MacEachern [Wed, 27 Feb 2002 03:21:09 +0000 (03:21 +0000)] 
changing mod_ssl to do a full startup/teardown on each restart rather
than hack to only read passphrase on 1st round startup.  this change:
- fixes current segv on restarts (SHARED_MODULE is not defined)
- allows LoadModule ssl_module to be added to httpd.conf on restart
  (was core dumping previously)
- allows certs/keys to be changed on restart provided key is not
  encrypted or SSLPassPhraseDialog is exec.  if key is encrypted and
  SSLPassPhraseDialog is builtin, existing private keys will be reused
  on restart (which happens currently for any type of key/dialog).

note: mod_ssl currently leaks on restart; leaks more with this change.
      fixes to come.

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

23 years agoUse the empty string, not NUL. I should have read my code more closely.
Ryan Bloom [Wed, 27 Feb 2002 00:58:17 +0000 (00:58 +0000)] 
Use the empty string, not NUL.  I should have read my code more closely.

Thanks Cliff for slapping me in the head.

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

23 years agoGrrrrr..... We should really use the correct line endings on all
Ryan Bloom [Wed, 27 Feb 2002 00:39:01 +0000 (00:39 +0000)] 
Grrrrr.....  We should really use the correct line endings on all
platforms.

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

23 years agoForward port of changes in mod_ssl for Apache 1.3 up through mod_ssl
Cliff Woolley [Mon, 25 Feb 2002 04:23:03 +0000 (04:23 +0000)] 
Forward port of changes in mod_ssl for Apache 1.3 up through mod_ssl
version 2.8.7-1.3.23.

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

23 years agoFix bad logging level.
Justin Erenkrantz [Sun, 17 Feb 2002 23:42:49 +0000 (23:42 +0000)] 
Fix bad logging level.

(Why does mod_ssl insist on having its own logging levels?  Bad, bad, bad.)

PR: 9842

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

23 years agoIf the file specified by SSLMutex cannot be created (because the directory does...
Justin Erenkrantz [Sat, 16 Feb 2002 18:35:21 +0000 (18:35 +0000)] 
If the file specified by SSLMutex cannot be created (because the directory      does not exist for example), children will segfault on init without giving      any reason that the user can figure out.  This happens because the module       init in the parent never checks to see if the mutex intialization succeded.     This patch adds this check and a user-friendly error message.

(Justin made one formatting change to this patch.)

Submitted by: Adam Sussman <myddryn@vishnu.vidya.com>
Reviewed by: Justin Erenkrantz

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

23 years ago What happened? 0.9.6b built just dandy without the flags... 0.9.6c won't
William A. Rowe Jr [Tue, 12 Feb 2002 23:19:32 +0000 (23:19 +0000)] 
  What happened?  0.9.6b built just dandy without the flags... 0.9.6c won't
  build for jack without these changes.  Of course they don't harm 0.9.6b
  builders either, unless they are outside of the states/EU/AU and find
  themselves free to ignore IP considerations.

  I'd really like to know _why_ 0.9.6c doesn't configure itself rationally.

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

23 years agoRemove the install_transport_filters hook. The same function can be
Ryan Bloom [Tue, 5 Feb 2002 22:18:49 +0000 (22:18 +0000)] 
Remove the install_transport_filters hook.  The same function can be
acheived with the pre_connection hook.  I have added the socket to the
pre_connection phase to make this possible.
Reviewed by: Bill Stoddard

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

23 years agoSilence a gcc warning about cpType being possibly used uninitialized,
Cliff Woolley [Sun, 3 Feb 2002 01:50:58 +0000 (01:50 +0000)] 
Silence a gcc warning about cpType being possibly used uninitialized,
and constify it while I'm at it.

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

23 years agoUse symbolic names
Martin Kraemer [Thu, 31 Jan 2002 14:55:05 +0000 (14:55 +0000)] 
Use symbolic names

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

23 years agoThe pre_config hook now takes a return value. This allows modules to
Aaron Bannert [Mon, 28 Jan 2002 23:49:40 +0000 (23:49 +0000)] 
The pre_config hook now takes a return value. This allows modules to
cause the server to bail out under error conditions.

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

23 years agoChange ap_get_brigade prototype to remove *readbytes in favor of readbytes.
Justin Erenkrantz [Fri, 25 Jan 2002 01:11:47 +0000 (01:11 +0000)] 
Change ap_get_brigade prototype to remove *readbytes in favor of readbytes.
If you need the length, you should be using apr_brigade_length.  This is
much more consistent.  Of all the places that call ap_get_brigade, only
one (ap_http_filter) needs the length.  This makes it now possible to
pass constants down without assigning them to a temporary variable first.

Also:
- Change proxy_ftp to use EXHAUSTIVE mode (didn't catch its -1 before)
- Fix buglet in mod_ssl that would cause it to return too much data in
  some circumstances

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

23 years ago- Add AP_MODE_SPECULATIVE support to mod_ssl
Justin Erenkrantz [Tue, 22 Jan 2002 06:33:35 +0000 (06:33 +0000)] 
- Add AP_MODE_SPECULATIVE support to mod_ssl
- Protect mod_ssl from dealing with modes it doesn't recognize.

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

23 years agoIf we would exhaust the buffer entirely, set it to NULL rather than
Justin Erenkrantz [Tue, 22 Jan 2002 06:26:07 +0000 (06:26 +0000)] 
If we would exhaust the buffer entirely, set it to NULL rather than
point at the end of the buffer with a length of 0.

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

23 years agoInput filtering prototype change: Socket blocking type should be
Justin Erenkrantz [Sat, 19 Jan 2002 07:45:18 +0000 (07:45 +0000)] 
Input filtering prototype change: Socket blocking type should be
separate from the input filter mode type.

We also no longer look at readbytes to determine the method of
filter operation.  This makes the use of filters more obvious and
allows a wider range of options for input filters modes.

To start with, the new input filter modes are:

AP_MODE_READBYTES (no more than *readbytes returned)
AP_MODE_GETLINE (old *readbytes == 0 case)
AP_MODE_EATCRLF (old AP_MODE_PEEK)
AP_MODE_SPECULATIVE (will be used in a future ap_getline rewrite)
AP_MODE_EXHAUSTIVE (old *readbytes == -1 case)
AP_MODE_INIT (special case for NNTP over SSL)

The block parameter is an apr_read_type_e: APR_BLOCK_READ, APR_NONBLOCK_READ

This also allows cleanup of mod_ssl's handling in the getline case.

Reviewed by: Ryan Bloom (concept), Greg Stein (concept)

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

23 years agomove OpenSSL specific SSL_{get,set}_state macros to the #ifdef'd group of
Doug MacEachern [Fri, 18 Jan 2002 23:26:46 +0000 (23:26 +0000)] 
move OpenSSL specific SSL_{get,set}_state macros to the #ifdef'd group of
macros for OpenSSL in mod_ssl.h

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

23 years agofix for SSLv2 requests
Doug MacEachern [Fri, 18 Jan 2002 00:13:25 +0000 (00:13 +0000)] 
fix for SSLv2 requests

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

23 years ago Clean up several typesaftey (signedness and size) emits.
William A. Rowe Jr [Thu, 17 Jan 2002 15:51:41 +0000 (15:51 +0000)] 
  Clean up several typesaftey (signedness and size) emits.

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

23 years agooutput filter optimizations:
Doug MacEachern [Thu, 17 Jan 2002 05:04:54 +0000 (05:04 +0000)] 
output filter optimizations:
- avoid creating a new bucket brigade for each EOS or FLUSH bucket
- do not pass FLUSH bucket since BIO_bucket_flush() already does so
  if there is any data to flush.
- do not call apr_brigade_destroy(bb); since we will have either
  emptied it or passed it, in which case it will be destroyed further
  down the chain.

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

23 years agoprevent possible segv if SSL_get_current_cipher() returns NULL in
Doug MacEachern [Thu, 17 Jan 2002 04:03:09 +0000 (04:03 +0000)] 
prevent possible segv if  SSL_get_current_cipher() returns NULL in
ssl_var_lookup_ssl_cipher()

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

23 years agoadjust BIO_METHOD initializers for sslc
Doug MacEachern [Thu, 17 Jan 2002 01:35:20 +0000 (01:35 +0000)] 
adjust BIO_METHOD initializers for sslc

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

23 years agorewrite of mod_ssl input filter for better performance and less memory usage
Doug MacEachern [Thu, 17 Jan 2002 00:54:33 +0000 (00:54 +0000)] 
rewrite of mod_ssl input filter for better performance and less memory usage
PR:
Obtained from:
Submitted by:
Reviewed by: Justin Erenkrantz

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

23 years agoDocument future binary compatibility problem.
Ben Laurie [Fri, 11 Jan 2002 16:40:43 +0000 (16:40 +0000)] 
Document future binary compatibility problem.

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

23 years ago The mutex must be pool-managed, not ssl managed. We are encountering
William A. Rowe Jr [Fri, 11 Jan 2002 06:05:18 +0000 (06:05 +0000)] 
  The mutex must be pool-managed, not ssl managed.  We are encountering
  segfaults on Win32 when the cleanup of the mutex occurs after the pool
  was destroyed.

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