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.
git-svn-id: https://svn.apache.org/repos/asf/serf/branches/ocsp-verification@1774753 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/buckets/ssl_buckets.c b/buckets/ssl_buckets.c
index 8dd655e..77730d0 100644
--- a/buckets/ssl_buckets.c
+++ b/buckets/ssl_buckets.c
@@ -587,7 +587,7 @@
#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 @@
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 @@
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,
