QuasarApp/openssl
4
0
Fork 0
mirror of https://github.com/QuasarApp/openssl.git synced 2025-05-07 06:59:41 +00:00
Code Issues Projects Releases Wiki Activity

Fix no-chacha and no-poly1305

Browse Source 
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5287)
This commit is contained in:
Matt Caswell 2018-02-08 15:45:35 +00:00
parent b53fdad0e4
commit 71cff963b4
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/cipherlist_test.c
View File

@ -72,7 +72,7 @@ static const uint32_t default_ciphers_in_order[] = {
TLS1_CK_DHE_RSA_WITH_AES_256_GCM_SHA384, TLS1_CK_DHE_RSA_WITH_AES_256_GCM_SHA384,
# endif # endif
# if !defined OPENSSL_NO_CHACHA && !defined OPENSSL_NO_POLY1305 # if !defined(OPENSSL_NO_CHACHA) && !defined(OPENSSL_NO_POLY1305)
# ifndef OPENSSL_NO_EC # ifndef OPENSSL_NO_EC
TLS1_CK_ECDHE_ECDSA_WITH_CHACHA20_POLY1305, TLS1_CK_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,
TLS1_CK_ECDHE_RSA_WITH_CHACHA20_POLY1305, TLS1_CK_ECDHE_RSA_WITH_CHACHA20_POLY1305,
@ -126,7 +126,9 @@ static const uint32_t default_ciphers_in_order[] = {
#endif #endif
#ifndef OPENSSL_NO_TLS1_3 #ifndef OPENSSL_NO_TLS1_3
TLS1_3_CK_AES_256_GCM_SHA384, TLS1_3_CK_AES_256_GCM_SHA384,
# if !defined(OPENSSL_NO_CHACHA) && !defined(OPENSSL_NO_POLY1305)
TLS1_3_CK_CHACHA20_POLY1305_SHA256, TLS1_3_CK_CHACHA20_POLY1305_SHA256,
# endif
TLS1_3_CK_AES_128_GCM_SHA256, TLS1_3_CK_AES_128_GCM_SHA256,
#endif #endif
#ifndef OPENSSL_NO_TLS1_2 #ifndef OPENSSL_NO_TLS1_2

2
test/sslapitest.c
View File

@ -2332,6 +2332,7 @@ static int test_ciphersuite_change(void)
SSL_free(clientssl); SSL_free(clientssl);
serverssl = clientssl = NULL; serverssl = clientssl = NULL;
# if !defined(OPENSSL_NO_CHACHA) && !defined(OPENSSL_NO_POLY1305)
/* Check we can resume a session with a different SHA-256 ciphersuite */ /* Check we can resume a session with a different SHA-256 ciphersuite */
if (!TEST_true(SSL_CTX_set_cipher_list(cctx, if (!TEST_true(SSL_CTX_set_cipher_list(cctx,
"TLS13-CHACHA20-POLY1305-SHA256")) "TLS13-CHACHA20-POLY1305-SHA256"))
@ -2350,6 +2351,7 @@ static int test_ciphersuite_change(void)
SSL_free(serverssl); SSL_free(serverssl);
SSL_free(clientssl); SSL_free(clientssl);
serverssl = clientssl = NULL; serverssl = clientssl = NULL;
# endif
/* /*
* Check attempting to resume a SHA-256 session with no SHA-256 ciphersuites * Check attempting to resume a SHA-256 session with no SHA-256 ciphersuites