[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  7f1d923aa9dc55dd23a7741e4341ec421c683941 (commit)
      from  734af93a278a7a06710167219e1f05e525c9dd49 (commit)


- Log -----------------------------------------------------------------
commit 7f1d923aa9dc55dd23a7741e4341ec421c683941
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Sep 24 12:20:45 2018 +0100

    Fix no-tls1_2
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/7308)

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

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

diff --git a/test/sslapitest.c b/test/sslapitest.c
index 15fe003..d87e9f6 100644
--- a/test/sslapitest.c
+++ b/test/sslapitest.c
@@ -5497,6 +5497,7 @@ static int test_shutdown(int tst)
     return testresult;
 }
 
+#if !defined(OPENSSL_NO_TLS1_2) || !defined(OPENSSL_NO_TLS1_3)
 static int cert_cb_cnt;
 
 static int cert_cb(SSL *s, void *arg)
@@ -5576,6 +5577,7 @@ static int test_cert_cb_int(int prot, int tst)
 
     return testresult;
 }
+#endif
 
 static int test_cert_cb(int tst)
 {
@@ -5584,7 +5586,7 @@ static int test_cert_cb(int tst)
 #ifndef OPENSSL_NO_TLS1_2
     testresult &= test_cert_cb_int(TLS1_2_VERSION, tst);
 #endif
-#ifdef OPENSSL_NO_TLS1_3
+#ifndef OPENSSL_NO_TLS1_3
     testresult &= test_cert_cb_int(TLS1_3_VERSION, tst);
 #endif