[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  6e07834ca0eaeb38da2696e74c16082efd45bbe2 (commit)
      from  c637891310ecfa9b3568da52a813cdf4a9872cf1 (commit)


- Log -----------------------------------------------------------------
commit 6e07834ca0eaeb38da2696e74c16082efd45bbe2
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Apr 18 09:29:18 2018 +0100

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

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

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

diff --git a/test/sslapitest.c b/test/sslapitest.c
index 5fef058..c4c0868 100644
--- a/test/sslapitest.c
+++ b/test/sslapitest.c
@@ -4308,6 +4308,7 @@ static int test_info_callback(int tst)
     info_cb_this_state = -1;
     info_cb_offset = tst;
 
+#ifndef OPENSSL_NO_TLS1_3
     if (tst >= 4) {
         SSL_SESSION *sess = NULL;
         size_t written, readbytes;
@@ -4342,6 +4343,7 @@ static int test_info_callback(int tst)
         testresult = 1;
         goto end;
     }
+#endif
 
     if (!TEST_true(create_ssl_ctx_pair(TLS_server_method(),
                                        TLS_client_method(),