Update - OpenSSL 1.1.1-pre7-dev
This commit is contained in:
@@ -63,6 +63,13 @@ static CIPHERLIST_TEST_FIXTURE *set_up(const char *const test_case_name)
|
||||
* are currently broken and should be considered mission impossible in libssl.
|
||||
*/
|
||||
static const uint32_t default_ciphers_in_order[] = {
|
||||
#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
|
||||
# ifndef OPENSSL_NO_EC
|
||||
TLS1_CK_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
|
||||
@@ -127,13 +134,6 @@ static const uint32_t default_ciphers_in_order[] = {
|
||||
TLS1_CK_RSA_WITH_AES_256_GCM_SHA384,
|
||||
TLS1_CK_RSA_WITH_AES_128_GCM_SHA256,
|
||||
#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
|
||||
TLS1_CK_RSA_WITH_AES_256_SHA256,
|
||||
TLS1_CK_RSA_WITH_AES_128_SHA256,
|
||||
@@ -215,7 +215,7 @@ static int test_default_cipherlist_explicit(void)
|
||||
return result;
|
||||
}
|
||||
|
||||
int setup_tests()
|
||||
int setup_tests(void)
|
||||
{
|
||||
ADD_TEST(test_default_cipherlist_implicit);
|
||||
ADD_TEST(test_default_cipherlist_explicit);
|
||||
|
||||
Reference in New Issue
Block a user