From: Joe Orton <jorton@apache.org>
Date: Wed, 28 Oct 2009 14:19:32 +0000 (+0000)
Subject: * modules/ssl/ssl_toolkit_compat.h: Fold #if checks to enable OCSP
X-Git-Tag: 2.3.3~114
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=23564c3f79fba27c9ffa09e096dcfdec29c4fc61;p=apache

* modules/ssl/ssl_toolkit_compat.h: Fold #if checks to enable OCSP
  stapling support, and also check that HAVE_OCSP is defined.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@830554 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/ssl/ssl_toolkit_compat.h b/modules/ssl/ssl_toolkit_compat.h
index 7fbc082a75..f1bdebdc3c 100644
--- a/modules/ssl/ssl_toolkit_compat.h
+++ b/modules/ssl/ssl_toolkit_compat.h
@@ -147,11 +147,10 @@ typedef int (modssl_read_bio_cb_fn)(char*,int,int,void*);
 
 #define HAVE_SSL_X509V3_EXT_d2i
 
-#if (OPENSSL_VERSION_NUMBER >= 0x00908080)
-#ifndef OPENSSL_NO_TLSEXT
+#if OPENSSL_VERSION_NUMBER >= 0x00908080 && defined(HAVE_OCSP) \
+    && !defined(OPENSSL_NO_TLSEXT)
 #define HAVE_OCSP_STAPLING
 #endif
-#endif
 
 #ifndef PEM_F_DEF_CALLBACK
 #ifdef PEM_F_PEM_DEF_CALLBACK