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

Mar 14, 2002

PR: · 0f1d5677

Doug MacEachern authored Mar 14, 2002

Obtained from:
Submitted by:
Reviewed by:
fix bug in ssl_io_input_getline():
in most cases we get all the headers on the first SSL_read.
however, in certain cases SSL_read will only get a partial
chunk of the headers, so we now try to read until LF is seen.

bug seen with netscape client (running both on linux and win32) and
server running on win32.


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

0f1d5677

Mar 13, 2002

Update our copyright for this year. · 5df8c9f0

Roy T. Fielding authored Mar 13, 2002


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

5df8c9f0

use ssl_asn1_keystr · 32a08ae6

Doug MacEachern authored Mar 13, 2002


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

32a08ae6

add ssl_asn1_keystr() util function that returns string representation · 22ac5add

Doug MacEachern authored Mar 13, 2002

(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

22ac5add

use ssl_asn1_table_keyfmt() function and only format each (rsa,dsa) · 27c4f2aa

Doug MacEachern authored Mar 13, 2002

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

27c4f2aa

use ssl_asn1_table_keyfmt() function · 070f67c0

Doug MacEachern authored Mar 13, 2002


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

070f67c0

add ssl_asn1_table_keyfmt() function for clarity · 840ec64e

Doug MacEachern authored Mar 13, 2002


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

840ec64e

PR: · 9dffb5c9

Doug MacEachern authored Mar 13, 2002

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

9dffb5c9

generalize session logging into ssl_session_log() function · 1f191a0d

Doug MacEachern authored Mar 13, 2002


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

1f191a0d

SSL_SESSION_id2sz() was NOT THREAD SAFE. it returned a pointer to a · 776cd031

Doug MacEachern authored Mar 13, 2002

static variable.  fixed.


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

776cd031

SSL_SESSION_id2sz() is somewhat expensive, make sure we only call it · 49a20531

Doug MacEachern authored Mar 13, 2002

if SSLLogLevel >= info


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

49a20531

cleanup logging of CRL, includes ridding of some malloc/frees · 5a03978a

Doug MacEachern authored Mar 13, 2002


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

5a03978a

couple o minor style/log fixos · 177ab306

Doug MacEachern authored Mar 13, 2002


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

177ab306

use ptemp in ssl_init_FindCAList() rather than creating a subpool. · 7a6e64a6

Doug MacEachern authored Mar 13, 2002


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

7a6e64a6

switch to ptemp pool for ssl_pphrase_Handle · dec1e863

Doug MacEachern authored Mar 13, 2002


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

dec1e863

only call: ssl_rand_seed(s, p, SSL_RSCTX_STARTUP, "Init: "); · 0488d3a6

Doug MacEachern authored Mar 13, 2002

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

0488d3a6

remove ssl_engine_ds.c · aff2ad0d

Doug MacEachern authored Mar 13, 2002


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

aff2ad0d

remove obsolete ssl_ds_{table,array} api · 02cba2dd

Doug MacEachern authored Mar 13, 2002


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

02cba2dd

replace ssl_ds_array usage with apr_array_header_t · 68ce3d07

Doug MacEachern authored Mar 13, 2002


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

68ce3d07

minor ssl_init_CheckServers() enhancements: · f6f254cf

Doug MacEachern authored Mar 13, 2002

- 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

f6f254cf

folding more duplication in ssl_tmp_keys_init · 57d0c4c0

Doug MacEachern authored Mar 13, 2002


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

57d0c4c0

Mar 12, 2002

cleanup tmp key callbacks. each had assigned the same (1024 bit) value · a5b174c2

Doug MacEachern authored Mar 12, 2002

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

a5b174c2

for the sake of readablity, · b19c0842

Doug MacEachern authored Mar 12, 2002

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

b19c0842

split ssl_init_TmpKeysHandle function to init/free functions, · 96a88dd9

Doug MacEachern authored Mar 12, 2002

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

96a88dd9

it is not required that temporary keys survive restarts, since they · 8b30c237

Doug MacEachern authored Mar 12, 2002

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

8b30c237

remove version checks for using EGD · aff64872

Doug MacEachern authored Mar 12, 2002


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

aff64872

remove call to legacy X509V3_add_standard_extensions() function, · bba714d9

Doug MacEachern authored Mar 12, 2002

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

bba714d9

we require OpenSSL 0.9.6+ · 2daa09c8

Doug MacEachern authored Mar 12, 2002


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

2daa09c8

removing unused ssl_init_ChildKill · 35821733

Doug MacEachern authored Mar 12, 2002


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

35821733

making ssl_init_SSLLibrary() static · a99886e5

Doug MacEachern authored Mar 12, 2002


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

a99886e5

cleanup version component construction. · 9bb0faec

Doug MacEachern authored Mar 12, 2002


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

9bb0faec

fold duplication of SSL{Proxy}VerifyDepth directives into · 704e610a

Doug MacEachern authored Mar 12, 2002

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

704e610a

Fixed a type mismatch · 5813400b

Bradley Nicholes authored Mar 12, 2002


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

5813400b

moving SSLVerifyClient directive parsing into ssl_cmd_verify_parse · e9ee30da

Doug MacEachern authored Mar 12, 2002

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

e9ee30da

Added NetWare to the ifdef list · 10e208de

Bradley Nicholes authored Mar 12, 2002


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

10e208de

fold duplication of SSL{Proxy}Protocol directives into · a1d62b1e

Doug MacEachern authored Mar 12, 2002

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

a1d62b1e

fold some duplication of server certs/keys directive checking into · 3db2f7d8

Doug MacEachern authored Mar 12, 2002

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

3db2f7d8

folding some command handler duplication into two generic functions: · ea436886

Doug MacEachern authored Mar 12, 2002

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

ea436886

get rid of some warnings for currently unused/unprototyped functions. · 4230b447

Doug MacEachern authored Mar 12, 2002

(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

4230b447

minor performance enhancement: no need to use md5 of VHostID for the · 72681eaa

Doug MacEachern authored Mar 12, 2002

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

72681eaa