From eca4debb8fa74d67fbeb4aefdcc3d67ef51386e0 Mon Sep 17 00:00:00 2001 From: Todd Lyons Date: Wed, 29 Oct 2014 07:50:41 -0700 Subject: [PATCH] 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. --- doc/doc-txt/ChangeLog | 3 +++ test/src/client.c | 9 ++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index ed4574729..5a298d161 100644 --- 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. +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 ----------------- diff --git a/test/src/client.c b/test/src/client.c index 72cebbeb4..5b52916ee 100644 --- 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. */ -#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 @@ -71,6 +66,10 @@ latter needs a whole pile of tables. */ # include # include # include +# 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 # endif -- 2.25.1