[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  71cff963b4b3f8432e7fea4c94c138ca61b07d95 (commit)
      from  b53fdad0e4350ba49812c50305686ee5a6239111 (commit)


- Log -----------------------------------------------------------------
commit 71cff963b4b3f8432e7fea4c94c138ca61b07d95
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Feb 8 15:45:35 2018 +0000

    Fix no-chacha and no-poly1305
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5287)

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

Summary of changes:
 test/cipherlist_test.c | 4 +++-
 test/sslapitest.c      | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/test/cipherlist_test.c b/test/cipherlist_test.c
index 2d8288d..336bdb0 100644
--- a/test/cipherlist_test.c
+++ b/test/cipherlist_test.c
@@ -72,7 +72,7 @@ static const uint32_t default_ciphers_in_order[] = {
     TLS1_CK_DHE_RSA_WITH_AES_256_GCM_SHA384,
 # endif
 
-# if !defined OPENSSL_NO_CHACHA && !defined OPENSSL_NO_POLY1305
+# if !defined(OPENSSL_NO_CHACHA) && !defined(OPENSSL_NO_POLY1305)
 #  ifndef OPENSSL_NO_EC
     TLS1_CK_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,
     TLS1_CK_ECDHE_RSA_WITH_CHACHA20_POLY1305,
@@ -126,7 +126,9 @@ static const uint32_t default_ciphers_in_order[] = {
 #endif
 #ifndef OPENSSL_NO_TLS1_3
     TLS1_3_CK_AES_256_GCM_SHA384,
+# if !defined(OPENSSL_NO_CHACHA) && !defined(OPENSSL_NO_POLY1305)
     TLS1_3_CK_CHACHA20_POLY1305_SHA256,
+# endif
     TLS1_3_CK_AES_128_GCM_SHA256,
 #endif
 #ifndef OPENSSL_NO_TLS1_2
diff --git a/test/sslapitest.c b/test/sslapitest.c
index b655fe7..483941a 100644
--- a/test/sslapitest.c
+++ b/test/sslapitest.c
@@ -2332,6 +2332,7 @@ static int test_ciphersuite_change(void)
     SSL_free(clientssl);
     serverssl = clientssl = NULL;
 
+# if !defined(OPENSSL_NO_CHACHA) && !defined(OPENSSL_NO_POLY1305)
     /* Check we can resume a session with a different SHA-256 ciphersuite */
     if (!TEST_true(SSL_CTX_set_cipher_list(cctx,
                                            "TLS13-CHACHA20-POLY1305-SHA256"))
@@ -2350,6 +2351,7 @@ static int test_ciphersuite_change(void)
     SSL_free(serverssl);
     SSL_free(clientssl);
     serverssl = clientssl = NULL;
+# endif
 
     /*
      * Check attempting to resume a SHA-256 session with no SHA-256 ciphersuites