serf-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r1774753 - /serf/branches/ocsp-verification/buckets/ssl_buckets.c
Date Sat, 17 Dec 2016 12:42:40 GMT
Author: brane
Date: Sat Dec 17 12:42:40 2016
New Revision: 1774753

URL: http://svn.apache.org/viewvc?rev=1774753&view=rev
Log:
On the ocsp-verification branch: Fix fallout from the r1774752 merge from trunk.

* buckets/ssl_buckets.c (ocsp_response_status):
   Must only be conditional on OPENSSL_NO_OCSP, not OPENSSL_NO_TLSEXT.

Modified:
    serf/branches/ocsp-verification/buckets/ssl_buckets.c

Modified: serf/branches/ocsp-verification/buckets/ssl_buckets.c
URL: http://svn.apache.org/viewvc/serf/branches/ocsp-verification/buckets/ssl_buckets.c?rev=1774753&r1=1774752&r2=1774753&view=diff
==============================================================================
--- serf/branches/ocsp-verification/buckets/ssl_buckets.c (original)
+++ serf/branches/ocsp-verification/buckets/ssl_buckets.c Sat Dec 17 12:42:40 2016
@@ -587,7 +587,7 @@ static void bio_meth_free(BIO_METHOD *bi
 #endif
 }
 
-#if !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_OCSP)
+#ifndef OPENSSL_NO_OCSP
 static int ocsp_response_status(int failures, OCSP_RESPONSE *response)
 {
     long resp_status = OCSP_response_status(response);
@@ -610,6 +610,7 @@ static int ocsp_response_status(int fail
     return failures;
 }
 
+#  ifndef OPENSSL_NO_TLSEXT
 /* Callback called when the server response has some OCSP info.
    Returns 1 if the application accepts the OCSP response as successful,
            0 in case of error.
@@ -675,7 +676,8 @@ static int ocsp_callback(SSL *ssl, void
 
     return cert_valid;
 }
-#endif  /* OPENSSL_NO_TLSEXT && OPENSSL_NO_OCSP */
+#  endif  /* OPENSSL_NO_TLSEXT */
+#endif    /* OPENSSL_NO_OCSP */
 
 typedef enum san_copy_t {
     EscapeNulAndCopy = 0,



Mime
View raw message