diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/cipherlist_test.c | 4 | ||||
| -rw-r--r-- | test/sslapitest.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/test/cipherlist_test.c b/test/cipherlist_test.c index 2d8288d214..336bdb0318 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 b655fe7eda..483941ac5c 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 |