Test suite: disable OCSP for old openssl part 2

Make sure to only disable this if building for openssl, allow gnutls
  to build with OCSP for all versions that support it.

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index ed4574729aabf31659843489cd2d8af3a6f64bd0..5a298d161604b0db07acd6607946e99a9c176b94 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -59,6 +59,9 @@ JH/08 Rename the TPDA expermimental facility to Event Actions.  The #ifdef
       raised for inbound connections, if the main configuration event_action
       option is defined.
 
       raised for inbound connections, if the main configuration event_action
       option is defined.
 

+TL/06 In test suite, disable OCSP for old versions of openssl which contained
+      early OCSP support, but no stapling (appears to be less than 1.0.0).
+

 
 Exim version 4.84
 -----------------
 
 Exim version 4.84
 -----------------

diff --git a/test/src/client.c b/test/src/client.c
index 72cebbeb47832cfe5f2c1734eb0f3abd817f9e7b..5b52916ee40a1b0617a07fcf3e0a883661cb9ecc 100644 (file)
--- a/test/src/client.c
+++ b/test/src/client.c
@@ -58,11 +58,6 @@ static int sigalrm_seen = 0;
 
 /* TLS support can be optionally included, either for OpenSSL or GnuTLS. The
 latter needs a whole pile of tables. */
 
 /* TLS support can be optionally included, either for OpenSSL or GnuTLS. The
 latter needs a whole pile of tables. */

-#if !defined(EXIM_HAVE_OPENSSL_TLSEXT) && !defined(DISABLE_OCSP)
-# warning "OpenSSL library version too old; define DISABLE_OCSP in Makefile"
-# define DISABLE_OCSP
-#endif
-

 #ifdef HAVE_OPENSSL
 # define HAVE_TLS
 # include <openssl/crypto.h>
 #ifdef HAVE_OPENSSL
 # define HAVE_TLS
 # include <openssl/crypto.h>


@@ -71,6 +66,10 @@ latter needs a whole pile of tables. */
 # include <openssl/ssl.h>
 # include <openssl/err.h>
 # include <openssl/rand.h>
 # include <openssl/ssl.h>
 # include <openssl/err.h>
 # include <openssl/rand.h>

+# if !defined(EXIM_HAVE_OPENSSL_TLSEXT) && !defined(DISABLE_OCSP)
+#  warning "OpenSSL library version too old; define DISABLE_OCSP in Makefile"
+#  define DISABLE_OCSP
+# endif

 # ifndef DISABLE_OCSP
 #  include <openssl/ocsp.h>
 # endif
 # ifndef DISABLE_OCSP
 #  include <openssl/ocsp.h>
 # endif