1
0
mirror of https://github.com/apache/httpd.git synced 2025-08-05 16:55:50 +03:00

28 Commits

Author SHA1 Message Date
Giovanni Bechis
d78beeb015 log an error if BIO_write(3) fails
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1910269 13f79535-47bb-0310-9956-ffa450edef68
2023-06-06 22:41:27 +00:00
Giovanni Bechis
ea2c84a0e3 release memory if needed
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1898366 13f79535-47bb-0310-9956-ffa450edef68
2022-02-24 11:39:59 +00:00
Giovanni Bechis
3462fcfa75 check BIO_new(3) return values
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1897663 13f79535-47bb-0310-9956-ffa450edef68
2022-02-01 15:29:18 +00:00
Ruediger Pluem
5906e825c4 * modules/ssl/ssl_util_ocsp.c (serialize_request): Set the Connection header
to close to indicate that we do not want to keep the HTTP connection to the
  OCSP responder alive. We don't reuse the connections currently and if the
  OCSP responder keeps the connection alive this could cause us to wait for
  keepalive timeout of the OCSP responder to timeout until we finish our
  reading of the OCSP response.

PR: 64135



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1874007 13f79535-47bb-0310-9956-ffa450edef68
2020-02-14 09:38:12 +00:00
Stefan Eissing
505cf744a8 *) mod_ssl: clear *SSL errors before loading certificates and checking
afterwards. Otherwise errors are reported when other SSL using modules
     are in play. Fixes PR 62880. [Michael Kaufmann]



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1845768 13f79535-47bb-0310-9956-ffa450edef68
2018-11-05 10:37:32 +00:00
William A. Rowe Jr
fee7329281 Revert r1783310 'Preserve OpenSSL 1.0.2 compatibility, following up on r1783305'
This was our first compatibility pattern but we are not preserving it, it seems
irrelevant since the death of 16 bit Windows object files.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1783432 13f79535-47bb-0310-9956-ffa450edef68
2017-02-17 17:29:51 +00:00
William A. Rowe Jr
342bc8e512 Preserve OpenSSL 1.0.2 compatibility, following up on r1783305
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1783310 13f79535-47bb-0310-9956-ffa450edef68
2017-02-16 21:41:55 +00:00
William A. Rowe Jr
561b273ca8 Fix OpenSSL 1.1.0 breakage in r1781575; BIO_s_file_internal() is gone.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1783305 13f79535-47bb-0310-9956-ffa450edef68
2017-02-16 21:26:34 +00:00
Daniel Ruggeri
873119e7d8 Remove unused variable
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1781687 13f79535-47bb-0310-9956-ffa450edef68
2017-02-04 16:51:59 +00:00
Jean-Frederic Clere
f6146b725c Add Configuration for trusted OCSP responder certificates
Fix for PR 46037


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1781575 13f79535-47bb-0310-9956-ffa450edef68
2017-02-03 16:19:17 +00:00
Ruediger Pluem
aef1c86d73 * Introduce SSLOCSPProxyURL in order to do OCSP requests via a HTTP proxy.
Documentation to follow.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1726881 13f79535-47bb-0310-9956-ffa450edef68
2016-01-26 20:24:33 +00:00
Jeff Trawick
f0153228f5 axe attempt to close a previously-closed apr socket
(clang scan-build says "uninitialized", but it doesn't know
how apr_sockaddr_info_get() reports errors)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1534890 13f79535-47bb-0310-9956-ffa450edef68
2013-10-23 01:25:05 +00:00
Joe Orton
0c3d56362b * modules/ssl/ssl_util_ocsp.c (read_response): Ignore empty buckets in
the brigade, which can be left over from line splitting.  Fixes case
  where the OCSP response was only partially read from the wire.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1488296 13f79535-47bb-0310-9956-ffa450edef68
2013-05-31 16:17:36 +00:00
Joe Orton
7ba4b2b378 * modules/ssl/ssl_util_ocsp.c (get_line): Don't set line[-1] to 0
when len == 0.

Submitted by: Jim Meyering <meyering redhat.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1358061 13f79535-47bb-0310-9956-ffa450edef68
2012-07-06 07:42:32 +00:00
Kaspar Brand
627e53503d logging adjustments:
- consistently call ssl_log_ssl_error after ap_log_error etc.
- ssl_init_ConfigureServer: add vhost_id to log message


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1213399 13f79535-47bb-0310-9956-ffa450edef68
2011-12-12 20:01:43 +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
Kaspar Brand
2453c22a1a Enforce OpenSSL 0.9.7 as a minimum requirement in configure, and
remove #ifdef'ed code which was relevant for earlier versions only.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1154688 13f79535-47bb-0310-9956-ffa450edef68
2011-08-07 10:36:57 +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
Joe Orton
c2a484bbb1 * modules/ssl/ssl_util_ocsp.c, modules/ssl/ssl_engine_ocsp.c:
Move comment on I/O timeout to appropriate place, thanks to
  Steve Henson.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@815741 13f79535-47bb-0310-9956-ffa450edef68
2009-09-16 12:47:33 +00:00
Joe Orton
229ca83b8f * modules/ssl/ssl_util_ocsp.c (send_request,
modssl_dispatch_ocsp_request): Take timeout as argument, as pass through.
  
* modules/ssl/ssl_engine_ocsp.c (verify_ocsp_status): Pass server timeout
  to modssl_dispatch_ocsp_request.

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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@815719 13f79535-47bb-0310-9956-ffa450edef68
2009-09-16 10:56:31 +00:00
Ruediger Pluem
9e39ba015a * Store the correct server_rec in the connection record configuration and
adjust the remaining part of mod_ssl to use this server_rec instead of
  c->base_server.

  modules/ssl/ssl_private.h:
  - server_rec member to SSLConnRec struct
  - Add macros to extract data from connection_rec
    mySrvFromConn(c)
    mySrvConfigFromConn(c)
    myModConfigFromConn(c)
  modules/ssl/ssl_engine_io.c
  modules/ssl/ssl_util_ocsp.c
  modules/ssl/ssl_engine_kernel.c
  modules/ssl/mod_ssl.c
  modules/ssl/ssl_engine_log.c
  - Use the new macros to extract data fron connection_rec
    and use the server_rec stored in SSLConnRec instead of
    c->base_server whereever appropriate.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@757463 13f79535-47bb-0310-9956-ffa450edef68
2009-03-23 17:37:38 +00:00
Ruediger Pluem
e1de193fc5 * Send Content-Type application/ocsp-request for POST requests to OSCP
responders.

PR: 46014
Submitted by: Dr Stephen Henson <steve openssl.org>
Reviewed by: rpluem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@704917 13f79535-47bb-0310-9956-ffa450edef68
2008-10-15 13:40:56 +00:00
Joe Orton
b96fe2d2f1 Relax checks for OCSP responder URIs:
* modules/ssl/ssl_engine_ocsp.c (determine_responder_uri): Allow
  NULL path; use default port for given schem.

* modules/ssl/ssl_util_ocsp.c (serialize_request): Use / if no path
  specified.

Submitted by: Kaspar Brand <asfbugz velox.ch>
PR: 45522


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@683242 13f79535-47bb-0310-9956-ffa450edef68
2008-08-06 12:14:00 +00:00
Joe Orton
8047103871 * modules/ssl/ssl_util_ocsp.c: Fix spelling mistake in comment; no
functional change.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@600497 13f79535-47bb-0310-9956-ffa450edef68
2007-12-03 11:58:42 +00:00
Joe Orton
080255428b * modules/ssl/ssl_util_ocsp.c (read_response): Bail out if the maximum
response-header count is exceeded.  Also bump to APLOG_ERR the log
  message given after a header read error.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@600482 13f79535-47bb-0310-9956-ffa450edef68
2007-12-03 11:15:31 +00:00
Joe Orton
fc7fdf4d26 * modules/ssl/ssl_util_ocsp.c (serialize_request): Fix query string
handling.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@599496 13f79535-47bb-0310-9956-ffa450edef68
2007-11-29 16:12:59 +00:00
Joe Orton
33c045efb2 mod_ssl: Add support for OCSP validation of client certificates:
* modules/ssl/ssl_engine_config.c (modssl_ctx_init,
  modssl_ctx_cfg_merge): Initialize and merge OCSP config options.
  (ssl_cmd_SSLOCSPOverrideResponder, ssl_cmd_SSLOCSPDefaultResponder,
  ssl_cmd_SSLOCSPEnable): Add functions.

* modules/ssl/mod_ssl.c (ssl_config_cmds): Add config options.

* modules/ssl/ssl_private.h: Add prototypes, config options to
  modssl_ctx_t.

* modules/ssl/ssl_util_ocsp.c: New file, utility interface for
  dispatching OCSP requests.

* modules/ssl/ssl_engine_ocsp.c: New file, interface for performing
  OCSP validation.

* modules/ssl/ssl_engine_kernel.c (ssl_callback_SSLVerify): Perform
  OCSP validation if configured, and the cert is so-far verified to be
  trusted.  Fail if OCSP validation is configured an the optional-no-ca 
  check tripped.

* modules/ssl/config.m4: Check for OCSP support, build new files.

* modules/ssl/mod_ssl.dsp: Build new files.

* modules/ssl/ssl_toolkit_compat.h: Include headers for OCSP
  interfaces.

PR: 41123
Submitted by: Marc Stern <marc.stern approach.be>, Joe Orton
Reviewed by: Steve Henson <steve openssl.org>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@599385 13f79535-47bb-0310-9956-ffa450edef68
2007-11-29 11:18:40 +00:00