[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  55386bef807c7edd0f1db036c0ed464b28a61d68 (commit)
      from  49e476a5382602d0bad1139d6f1f66ddbc7959d6 (commit)


- Log -----------------------------------------------------------------
commit 55386bef807c7edd0f1db036c0ed464b28a61d68
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Sep 28 09:35:05 2016 +0100

    Fix no-dtls
    
    The new large message test in sslapitest needs OPENSSL_NO_DTLS guards
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

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

diff --git a/test/sslapitest.c b/test/sslapitest.c
index b08eb8c..4d22d8e 100644
--- a/test/sslapitest.c
+++ b/test/sslapitest.c
@@ -108,11 +108,13 @@ static int test_large_message_tls(void)
     return execute_test_large_message(TLS_server_method(), TLS_client_method());
 }
 
+#ifndef OPENSSL_NO_DTLS
 static int test_large_message_dtls(void)
 {
     return execute_test_large_message(DTLS_server_method(),
                                       DTLS_client_method());
 }
+#endif
 
 static int ocsp_server_cb(SSL *s, void *arg)
 {
@@ -861,7 +863,9 @@ int main(int argc, char *argv[])
     CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
 
     ADD_TEST(test_large_message_tls);
+#ifndef OPENSSL_NO_DTLS
     ADD_TEST(test_large_message_dtls);
+#endif
     ADD_TEST(test_tlsext_status_type);
     ADD_TEST(test_session_with_only_int_cache);
     ADD_TEST(test_session_with_only_ext_cache);