[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  04225915731e913b4ad077aff6b6d7bbeb8b916b (commit)
      from  693cf80c6ff54ae276a44d305d4ad07168ec6895 (commit)


- Log -----------------------------------------------------------------
commit 04225915731e913b4ad077aff6b6d7bbeb8b916b
Author: Matt Caswell <matt at openssl.org>
Date:   Mon May 21 10:46:58 2018 +0100

    Fix no-ec, no-tls1_3 and no-tls
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/6321)

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

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

diff --git a/test/sslapitest.c b/test/sslapitest.c
index 10bfc8a..9b0237e 100644
--- a/test/sslapitest.c
+++ b/test/sslapitest.c
@@ -1197,6 +1197,7 @@ static int test_session_with_both_cache(void)
 #endif
 }
 
+#ifndef OPENSSL_NO_TLS1_3
 static SSL_SESSION *sesscache[6];
 static int do_cache;
 
@@ -1324,6 +1325,7 @@ static int test_tickets(int idx)
 
     return testresult;
 }
+#endif
 
 #define USE_NULL            0
 #define USE_BIO_1           1