[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  ba8b48e98dd86851ca20733f819da5b76859e64a (commit)
       via  199dc0d3e857fa4242d90d89a0df52e87b975c67 (commit)
      from  986caf9e34fd60366a5b3711bb12e239e43a2431 (commit)


- Log -----------------------------------------------------------------
commit ba8b48e98dd86851ca20733f819da5b76859e64a
Author: Matt Caswell <matt at openssl.org>
Date:   Mon May 14 14:37:16 2018 +0100

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

commit 199dc0d3e857fa4242d90d89a0df52e87b975c67
Author: Matt Caswell <matt at openssl.org>
Date:   Mon May 14 14:28:06 2018 +0100

    Fix no-psk
    
    Fixes #6239
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/6253)

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

Summary of changes:
 ssl/s3_lib.c      | 2 ++
 test/sslapitest.c | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index c5f2235..354769b 100644
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -4192,6 +4192,7 @@ const SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt,
     }
 
     if (SSL_IS_TLS13(s)) {
+#ifndef OPENSSL_NO_PSK
         int j;
 
         /*
@@ -4208,6 +4209,7 @@ const SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt,
                 prefer_sha256 = 1;
             }
         }
+#endif
     } else {
         tls1_set_cert_validity(s);
         ssl_set_masks(s);
diff --git a/test/sslapitest.c b/test/sslapitest.c
index fc7288d..06d6cb2 100644
--- a/test/sslapitest.c
+++ b/test/sslapitest.c
@@ -4693,11 +4693,11 @@ static int test_ticket_callbacks(int tst)
     int testresult = 0;
 
 #ifdef OPENSSL_NO_TLS1_2
-    if (tst % 2 == 0);
+    if (tst % 2 == 0)
         return 1;
 #endif
 #ifdef OPENSSL_NO_TLS1_3
-    if (tst % 2 == 1);
+    if (tst % 2 == 1)
         return 1;
 #endif