1
0
mirror of https://github.com/apache/httpd.git synced 2025-11-11 02:42:23 +03:00
Commit Graph

20 Commits

Author SHA1 Message Date
Stefan Fritsch
80ab7f95b9 Pass the server_rec to ssl_die() and use it to log a message to the main error
log, pointing to the appropriate virtual host error log


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1348660 13f79535-47bb-0310-9956-ffa450edef68
2012-06-10 21:00:39 +00:00
Kaspar Brand
9900465205 Set OPENSSL_NO_SSL_INTERN when compiling against OpenSSL 1.0.1
or later, so that mod_ssl retains binary compatibility with future
versions when internal structures are changed. Use API functions
where available, and fall back to direct access for OpenSSL up
to 1.0.0, where needed.

Remove SSL_make_ciphersuite() from ssl_util_ssl.[ch], as it was
never used by any released version of mod_ssl.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1222917 13f79535-47bb-0310-9956-ffa450edef68
2011-12-24 06:31:37 +00:00
Stefan Fritsch
26d5fb7164 Add some more log message tags
Remove some log message tags from ap_log_* calls that log lots of
different error messages, in particular the config parsing errors.
Not sure how we should handle those.

ssl_util.c: Downgrade some dynamic locking messages from level DEBUG
to TRACE1-3



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1210252 13f79535-47bb-0310-9956-ffa450edef68
2011-12-04 22:09:24 +00:00
Stefan Fritsch
92e366007c Add lots of unique tags to error log messages
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1209766 13f79535-47bb-0310-9956-ffa450edef68
2011-12-02 23:02:04 +00:00
Jim Jagielski
427c85bd23 Cleanup effort in prep for GA push:
Trim trailing whitespace... no func change



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1174751 13f79535-47bb-0310-9956-ffa450edef68
2011-09-23 13:39:32 +00:00
Stephen Henson
7c4294b796 Use correct type, need OPENSSL_STRING for >= 1.0 which doesn't exist on 0.9.8
so #define sk_OPENSSL_STRING_pop to  sk_pop on 0.9.8


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1040366 13f79535-47bb-0310-9956-ffa450edef68
2010-11-30 00:50:36 +00:00
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
Stephen Henson
cdb0073eec Make sure OCSP Stapling Mutex is initiliased if we need it.
PR 49498


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1023821 13f79535-47bb-0310-9956-ffa450edef68
2010-10-18 14:45:19 +00:00
William A. Rowe Jr
01d300298f Catch up with ap_[proc|global]_mutex_create api change
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@940981 13f79535-47bb-0310-9956-ffa450edef68
2010-05-04 17:40:43 +00:00
William A. Rowe Jr
dcac7e0552 Catch up ssl to socache store expiry change, and clarify what the code is doing
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@907918 13f79535-47bb-0310-9956-ffa450edef68
2010-02-09 03:44:04 +00:00
William A. Rowe Jr
54e9063b80 Style guides at httpd are pretty clear, macro values are UPCASE, please?
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@907472 13f79535-47bb-0310-9956-ffa450edef68
2010-02-07 20:25:21 +00:00
William A. Rowe Jr
bddf9300b4 Fix default OSCP stapling port.
Submitted by: Dr Stephen Henson <steve openssl.org>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@903026 13f79535-47bb-0310-9956-ffa450edef68
2010-01-26 00:24:07 +00:00
Jeff Trawick
2e9668a33d Replace AcceptMutex, LockFile, RewriteLock, SSLMutex, SSLStaplingMutex,
and WatchdogMutexPath with a single Mutex directive.  Add APIs to
simplify setup and user customization of APR proc and global mutexes.  
(See util_mutex.h.)  Build-time setting DEFAULT_LOCKFILE is no longer
respected; set DEFAULT_REL_RUNTIMEDIR instead.

Some existing modules, such as mod_ldap and mod_auth_digest gain 
configurability for their mutexes.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@883540 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 23:17:51 +00:00
Sander Temme
8abd8d66b3 We now check for OCSP support in configure, so we can lose an OpenSSL version
number check.  Use a type safe STACK.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@832496 13f79535-47bb-0310-9956-ffa450edef68
2009-11-03 18:19:33 +00:00
Joe Orton
7dc3e1fa62 * modules/ssl/ssl_util_stapling.c (stapling_cache_response): Use
apr_time_now() rather than time().

Reported by: rpluem.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@830551 13f79535-47bb-0310-9956-ffa450edef68
2009-10-28 14:05:09 +00:00
Joe Orton
edb0565bd4 * modules/ssl/ssl_util_stapling.c (stapling_cb): Use mySrvFromConn(),
thanks to rpluem.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@830546 13f79535-47bb-0310-9956-ffa450edef68
2009-10-28 14:00:53 +00:00
Joe Orton
080f897928 * module/ssl/ssl_util_stapling.c: Style fixes, no functional change.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@830544 13f79535-47bb-0310-9956-ffa450edef68
2009-10-28 13:58:56 +00:00
Guenter Knauf
9596adcdb1 fixed indents.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@830175 13f79535-47bb-0310-9956-ffa450edef68
2009-10-27 13:31:30 +00:00
Guenter Knauf
2db0e1a114 converted tabs, removed trailing spaces.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@830045 13f79535-47bb-0310-9956-ffa450edef68
2009-10-27 01:35:22 +00:00
Joe Orton
b2cb650f61 Add support for OCSP "stapling":
* modules/ssl/ssl_util_stapling.c: New file.

* modules/ssl/config.m4, modules/ssl/mod_ssl.dsp: Build it.

* modules/ssl/ssl_toolkit_compat.h: Define HAVE_OCSP_STAPLING if
  OpenSSL is of suitable version (>= 0.9.8g) and capability (TLS
  extension support enabled).

* modules/ssl/mod_ssl.c: Add config directives.

* modules/ssl/ssl_private.h: Add prototypes for new functions.
  (SSLModConfigRec): Add fields for stapling socache instance and
  associated mutex.
  (modssl_ctx_t): Add config fields for stapling.

* modules/ssl/ssl_engine_init.c (ssl_init_Module, ssl_init_Child):
  Call the stapling initialization functions.

* modules/ssl/ssl_engine_config.c: Add config hooks.

* modules/ssl/ssl_scache.c: Create, initialize and destroy the socache
  instance for OCSP responses.

Submitted by: Dr Stephen Henson <shenson oss-institute.org>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@829619 13f79535-47bb-0310-9956-ffa450edef68
2009-10-25 17:21:10 +00:00