[openssl-commits] [openssl] OpenSSL_1_1_0-stable update

[Ben Laurie]

The branch OpenSSL_1_1_0-stable has been updated
       via  d0929aff549bdcf400fdc243970c7e58ea2ce24a (commit)
      from  d8631ebaabbf6f31bc8fe50c42e2be8c166cfc6b (commit)


- Log -----------------------------------------------------------------
commit d0929aff549bdcf400fdc243970c7e58ea2ce24a
Author: Ben Laurie <ben at links.org>
Date:   Sat Oct 1 12:45:41 2016 +0100

    Fix no-ocsp.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 test/sslapitest.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/test/sslapitest.c b/test/sslapitest.c
index 4d22d8e..3c58331 100644
--- a/test/sslapitest.c
+++ b/test/sslapitest.c
@@ -21,12 +21,14 @@
 static char *cert = NULL;
 static char *privkey = NULL;
 
+#ifndef OPENSSL_NO_OCSP
 static const unsigned char orespder[] = "Dummy OCSP Response";
 static int ocsp_server_called = 0;
 static int ocsp_client_called = 0;
 
 static int cdummyarg = 1;
 static X509 *ocspcert = NULL;
+#endif
 
 #define NUM_EXTRA_CERTS 40
 
@@ -116,6 +118,7 @@ static int test_large_message_dtls(void)
 }
 #endif
 
+#ifndef OPENSSL_NO_OCSP
 static int ocsp_server_cb(SSL *s, void *arg)
 {
     int *argi = (int *)arg;
@@ -167,6 +170,7 @@ static int ocsp_client_cb(SSL *s, void *arg)
     return 1;
 }
 
+
 static int test_tlsext_status_type(void)
 {
     SSL_CTX *cctx = NULL, *sctx = NULL;
@@ -349,6 +353,7 @@ static int test_tlsext_status_type(void)
 
     return testresult;
 }
+#endif  /* ndef OPENSSL_NO_OCSP */
 
 typedef struct ssl_session_test_fixture {
     const char *test_case_name;
@@ -866,7 +871,9 @@ int main(int argc, char *argv[])
 #ifndef OPENSSL_NO_DTLS
     ADD_TEST(test_large_message_dtls);
 #endif
+#ifndef OPENSSL_NO_OCSP
     ADD_TEST(test_tlsext_status_type);
+#endif
     ADD_TEST(test_session_with_only_int_cache);
     ADD_TEST(test_session_with_only_ext_cache);
     ADD_TEST(test_session_with_both_cache);