diff options
| author | Matt Caswell <matt@openssl.org> | 2018-02-08 15:45:35 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2018-02-08 17:20:55 +0000 |
| commit | 71cff963b4b3f8432e7fea4c94c138ca61b07d95 (patch) | |
| tree | 473882a6c17d252f4e13d8ed1c02de43690e8cc7 /test/cipherlist_test.c | |
| parent | b53fdad0e4350ba49812c50305686ee5a6239111 (diff) | |
Fix no-chacha and no-poly1305
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5287)
Diffstat (limited to 'test/cipherlist_test.c')
| -rw-r--r-- | test/cipherlist_test.c | 4 |
1 files changed, 3 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 |