/[Apache-SVN]
ViewVC logotype

Revision 1774748


Jump to revision: Previous Next
Author: brane
Date: Sat Dec 17 12:27:08 2016 UTC (7 years, 6 months ago)
Changed paths: 3
Log Message:
Make Serf compile and tests pass when the symbols OPENSSL_NO_TLSEXT
and/or OPENSSL_NO_OCSP are defined.

These symbols are used in several places to enclose conditional blocks
of code, but some checks were missing.

* buckets/ssl_buckets.c
  (ocsp_callback): Make conditional on OPENSSL_NO_OCSP, too.
  (serf_ssl_check_cert_status_request): Likelwise.

* test/MockHTTPinC/MockHTTP_server.c
  (ocspCreateResponse, ocspStatusCallback): Make conditional on
   OPENSSL_NO_TLSEXT and OPENSSL_NO_OCSP.
  (alpn_select_callback): Make conditional on OPENSSL_NO_TLSEXT.
  (initSSLCtx): Don't use alpn_select_callback depending on OPENSSL_NO_TLSEXT.
   Likewise for ocspStatusCallback, which also depends on OPENSSL_NO_OCSP.

* test/test_ssl.c
  (test_ss l_ocsp_response_error_and_override): Do not check for stapled
   OCSP response depending on OPENSSL_NO_TLSEXT and OPENSSL_NO_OCSP.
  (http11_select_protocol, http11_alpn_setup): Make conditional on
   OPENSSL_NO_TLSEXT and OPENSSL_NO_OCSP.
  (test_ssl_alpn_negotiate): Make test no-op depending on OPENSSL_NO_TLSEXT.


Changed paths

Path Details
Directoryserf/trunk/buckets/ssl_buckets.c modified , text changed
Directoryserf/trunk/test/MockHTTPinC/MockHTTP_server.c modified , text changed
Directoryserf/trunk/test/test_ssl.c modified , text changed

infrastructure at apache.org
ViewVC Help
Powered by ViewVC 1.1.26