www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-11-05 05:30:39 +03:00
Code Activity
20,467 Commits 62 Branches 304 Tags
d658afdd1c96f5b0ecb2a8da5ecafe0478d2dec0
Commit Graph

62 Commits

Author SHA1 Message Date
Stefan Fritsch
d658afdd1c Consistently use loglevel emerg before ssl_die() 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1026903 13f79535-47bb-0310-9956-ffa450edef68
 2010-10-24 21:57:08 +00:00
Stefan Fritsch
9d791e0e60 Fix some modules to make them compile with per-module loglevels. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@951894 13f79535-47bb-0310-9956-ffa450edef68
 2010-06-06 16:56:08 +00:00
Stefan Fritsch
7d6bd86673 Introduce SSLLOG_MARK for use with ssl_log_ssl_error(). This will allow to 
redefine APLOG_MARK later.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@951194 13f79535-47bb-0310-9956-ffa450edef68
 2010-06-03 22:57:00 +00:00
Stephen Henson
315e2dca82 Free surrounding PKCS7 structure to avoid a leak. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@930063 13f79535-47bb-0310-9956-ffa450edef68
 2010-04-01 18:47:27 +00:00
Sander Temme
b90aee19b9 enable support for ECC keys and ECDH ciphers. Tested against 
OpenSSL 1.0.0b3.  [Vipul Gupta vipul.gupta sun.com, Sander Temme]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@834378 13f79535-47bb-0310-9956-ffa450edef68
 2009-11-10 07:55:13 +00:00
Sander Temme
e35f22e5a5 Move struct definition out of the header file since it is only used in this source file 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@687819 13f79535-47bb-0310-9956-ffa450edef68
 2008-08-21 18:19:21 +00:00
Sander Temme
c31e8fbb73 Implement dynamic mutex callbacks for the benefit of OpenSSL. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@687550 13f79535-47bb-0310-9956-ffa450edef68
 2008-08-21 04:20:21 +00:00
Ruediger Pluem
047d24699d * Style police / style nitpicking. No functional changes. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@424823 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-23 21:22:37 +00:00
Ben Laurie
20c7ffc756 Layout and compiler warning. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@424735 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-23 13:17:28 +00:00
Ben Laurie
892785ce39 Add PKCS#7 support. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@424707 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-23 10:55:07 +00:00
Roy T. Fielding
de659cbed0 update license header text 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@420983 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-11 20:33:53 +00:00
Colm MacCarthaigh
dd95d7c37c Update the copyright year in all .c, .h and .xml files 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@395228 13f79535-47bb-0310-9956-ffa450edef68
 2006-04-19 12:11:27 +00:00
Jim Jagielski
5061d9fa92 No functional Change: Removing trailing whitespace. This also 
means that "blank" lines consisting of just spaces or
tabs are now really blank lines


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@332306 13f79535-47bb-0310-9956-ffa450edef68
 2005-11-10 15:11:44 +00:00
Martin Kraemer
e81d81c374 Fix Bug#: 25659 (Memory leak in ssl_util_algotypeof()) 
Reported by David Blake in 2003, including patch.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@290459 13f79535-47bb-0310-9956-ffa450edef68
 2005-09-20 14:42:31 +00:00
Justin Erenkrantz
905cdf9f0b Update copyright year to 2005 and standardize on current copyright owner line. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@151408 13f79535-47bb-0310-9956-ffa450edef68
 2005-02-04 20:28:49 +00:00
Joe Orton
f10b0ad3dc * modules/ssl/ssl_util.c, modules/ssl/ssl_private.h: Remove unused 
functions ssl_util_strupper, ssl_util_ptxtstub, and
ssl_util_uuencode*.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103755 13f79535-47bb-0310-9956-ffa450edef68
 2004-05-25 12:16:53 +00:00
Joe Orton
3ca3524c31 Move mod_ssl-internal interfaces into ssl_private.h; allow mod_ssl.h 
to be included even when mod_ssl is not enabled.

* Makefile.in (install-include): Only install mod_ssl.h.

* modules/ssl/ssl_private.h: New file.

* modules/ssl/mod_ssl.h: Move everything apart from than the optional
hook definitions into ssl_private.h.

* modules/ssl/*.c: Include ssl_private.h not mod_ssl.h

* modules/ssl/config.m4: Always add the mod_ssl directory to the
include path so other modules can find mod_ssl.h.

* modules/proxy/mod_proxy.c: Include mod_ssl.h to pick up the optional
hook definitions rather than copy'n'pasting them.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102803 13f79535-47bb-0310-9956-ffa450edef68
 2004-02-28 18:06:35 +00:00
André Malo
a688f06b19 fix name of The Apache Software Foundation 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102618 13f79535-47bb-0310-9956-ffa450edef68
 2004-02-09 20:31:03 +00:00
André Malo
0b6155c539 fix copyright dates according to the first check in 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102573 13f79535-47bb-0310-9956-ffa450edef68
 2004-02-08 12:52:25 +00:00
André Malo
4f02cb1e18 apply Apache License, Version 2.0 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102525 13f79535-47bb-0310-9956-ffa450edef68
 2004-02-06 22:58:42 +00:00
André Malo
fb07607180 update license to 2004. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102135 13f79535-47bb-0310-9956-ffa450edef68
 2004-01-01 13:26:26 +00:00
William A. Rowe Jr
bfc7b8e373 SSL-C doesn't declare the char* file arg const, so we shouldn't either. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101303 13f79535-47bb-0310-9956-ffa450edef68
 2003-09-22 19:26:21 +00:00
Joe Orton
3b7ec87745 Prevent the OpenSSL id_callback from pointing at a mod_ssl 
function after mod_ssl is unloaded.

* ssl_util.c (ssl_util_thread_cleanup): Clear the id_callback.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100767 13f79535-47bb-0310-9956-ffa450edef68
 2003-07-24 15:35:05 +00:00
William A. Rowe Jr
cd6f871087 Have some consistency! Fixes logic I introduced in 1.37. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@99253 13f79535-47bb-0310-9956-ffa450edef68
 2003-04-05 19:32:01 +00:00
William A. Rowe Jr
e25454c894 Introduce a number of SSLC hints to mod_ssl, including the following 
type overrides;

    MODSSL_CLIENT_CERT_CB_ARG_TYPE
    MODSSL_PCHAR_CAST      (for a host of non-void/const sslc values)
    modssl_read_bio_cb_fn  (for several callbacks with same prototypes)

  Declare callback functions appropriately.

  And protect us from indetermineant toolkits with
  #error "Unrecognized SSL Toolkit!"


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@99183 13f79535-47bb-0310-9956-ffa450edef68
 2003-04-03 04:54:20 +00:00
André Malo
742af25096 finished that boring job: 
update license to 2003.

Happy New Year! ;-))


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98573 13f79535-47bb-0310-9956-ffa450edef68
 2003-02-03 17:53:28 +00:00
William A. Rowe Jr
2f62c790c7 After some productive feedback and no negative feedback, introduce 
SSLEngine upgrade so that we can begin and continue to support these
  facilities.  This makes it simpler to keep this effort (while we have
  no known clients that support Connection: upgrade at this time), and
  begin refactoring more of SSL into smaller and tighter (and then optional)
  components.

  Submitted by: Ryan Bloom
  Reviewed by: William Rowe, Joe Orton


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97912 13f79535-47bb-0310-9956-ffa450edef68
 2002-12-14 07:46:45 +00:00
Ryan Bloom
658c2437bd This stuff shouldn't have been committed. This is the SSL upgrade stuff, 
and it was included in a commit that shouldn't have touched these files.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97201 13f79535-47bb-0310-9956-ffa450edef68
 2002-10-14 04:15:58 +00:00
Ryan Bloom
37f9061757 Fix a compile of compiler warnings. I don't know how these slipped past. 
Also, uncomment a line of code that the last commit should have uncommented.
Randall found this line and the fix, but I forgot to uncomment this line
along with the fix.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97179 13f79535-47bb-0310-9956-ffa450edef68
 2002-10-11 15:29:22 +00:00
William A. Rowe Jr
4a621ec661 The only remaining question ... are nested or strictly unnested locks 
expected by OpenSSL?  Right now I've left it as _DEFAULT for the platform
  preference.  Very simple code really - the server_rec was superfluous.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95497 13f79535-47bb-0310-9956-ffa450edef68
 2002-06-04 02:19:33 +00:00
Jeff Trawick
c6512b2859 Fix a mod_ssl build problem on OS/390. 
This is admittedly rather ugly code to come up with a unique 4-byte
identifier for the thread.  Since our threads are pthreads and a pthread
maps 1:1 to a TCB, the address of the TCB is sufficient.   Yes, every
TCB sees a different piece of real storage mapped to the first page,
so the code does make sense.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95016 13f79535-47bb-0310-9956-ffa450edef68
 2002-05-09 10:53:28 +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
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
Roy T. Fielding
845cbfd508 Update our copyright for this year. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93918 13f79535-47bb-0310-9956-ffa450edef68
 2002-03-13 20:48:07 +00:00
Doug MacEachern
07965e685f 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@93912 13f79535-47bb-0310-9956-ffa450edef68
 2002-03-13 18:56:07 +00:00
Doug MacEachern
cc09059d11 add ssl_asn1_table_keyfmt() function for clarity 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93909 13f79535-47bb-0310-9956-ffa450edef68
 2002-03-13 18:42:05 +00:00
Doug MacEachern
cc61103ca6 remove obsolete ssl_ds_{table,array} api 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93891 13f79535-47bb-0310-9956-ffa450edef68
 2002-03-13 04:14:43 +00:00
Ben Laurie
d4b00b3dfc Document future binary compatibility problem. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92829 13f79535-47bb-0310-9956-ffa450edef68
 2002-01-11 16:40:43 +00:00
Doug MacEachern
c53456b4c1 mod_ssl adjustments to help with using toolkits other than OpenSSL: 
Use SSL functions/macros instead of directly dereferencing SSL
  structures wherever possible.
  Add type-casts for the cases where functions return a generic pointer.
  Add $SSL/include to configure search path.
PR:
Obtained from:
Submitted by:	Madhusudan Mathihalli <madhusudan_mathihalli@hp.com>
Reviewed by:	dougm


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92800 13f79535-47bb-0310-9956-ffa450edef68
 2002-01-10 04:55:19 +00:00
Doug MacEachern
7712c61146 get SSLPassPhraseDialog exec: working by passing the proper arguments 
to apr_proc_create()
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92786 13f79535-47bb-0310-9956-ffa450edef68
 2002-01-09 19:24:32 +00:00
Doug MacEachern
29ba8b4f1d ssl_util_getmodconfig() and ssl_util_getmodconfig_ssl() show up high 
in the gprof profile.  there's no need for the "global" SSLModConfigRec
to live in the s->process->pool userdata table.  we now just point the
SSLSrvConfigRec in each server_rec.module_config to the SSLModConfigRec
so we can access it directly which is much faster.
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92234 13f79535-47bb-0310-9956-ffa450edef68
 2001-11-29 05:45:48 +00:00
Aaron Bannert
eb519bfa8f Gets us compiling again on FreeBSD. Adds conditional compilation around 
thread mutex routines for when we don't have APR_HAS_THREADS.

Submitted by:	Justin Erenkrantz
Reviewed by:	Aaron Bannert


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92061 13f79535-47bb-0310-9956-ffa450edef68
 2001-11-20 22:23:51 +00:00
Aaron Bannert
0acc68d2bb No good reason to have this in <> instead of "". Having it in <> might 
interact badly with makefile dependency generators, too.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92059 13f79535-47bb-0310-9956-ffa450edef68
 2001-11-20 21:34:43 +00:00
Aaron Bannert
e343768e81 Conversion from old apr_lock_t to new apr_thread_mutex_t 
(only converting INTRAPROCESS locks at this time).

I don't see how this used to work, which also means I'm not entirely
sure if it works now. It really didn't look like it was allocating
the correct size before. It compiles and SSL still works in my limited
tests, but I'd appreciate a second opinion.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91979 13f79535-47bb-0310-9956-ffa450edef68
 2001-11-16 18:28:25 +00:00
Aaron Bannert
51584e7cea Style updates before I convert to the new lock type. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91966 13f79535-47bb-0310-9956-ffa450edef68
 2001-11-15 17:29:01 +00:00
Doug MacEachern
ddd3cb2684 apr_os_thread_current() call needs #if APR_HAS_THREADS protection 
PR:
Obtained from:
Submitted by:    Justin Erenkrantz <jerenkrantz@ebuilt.com>
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90622 13f79535-47bb-0310-9956-ffa450edef68
 2001-08-24 06:34:26 +00:00
Doug MacEachern
7bc5a05907 fix prototype 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90621 13f79535-47bb-0310-9956-ffa450edef68
 2001-08-24 06:22:09 +00:00
Doug MacEachern
7d3995d3cc implement CRYPTO_set_id_callback 
PR:
Obtained from:
Submitted by:	Madhusudan Mathihalli <madhusudan_mathihalli@hp.com>
Reviewed by:	dougm


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90620 13f79535-47bb-0310-9956-ffa450edef68
 2001-08-24 06:15:39 +00:00
Doug MacEachern
00bd672b67 change APR_LOCKALL to APR_INTRAPROCESS for crypto locks 
PR:
Obtained from:
Submitted by:	Justin Erenkrantz <jerenkrantz@ebuilt.com>
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90618 13f79535-47bb-0310-9956-ffa450edef68
 2001-08-24 05:31:51 +00:00
Doug MacEachern
30354a3b9b only set the crypto locking callback if mpm is threaded 
get rid of some warnings introduced by the original patch
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90614 13f79535-47bb-0310-9956-ffa450edef68
 2001-08-24 04:16:57 +00:00