Commit 7731e619 authored by Matt Caswell's avatar Matt Caswell
Browse files

Fix no-chacha and no-poly1305 



Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5623)
parent 01985122

include/openssl/ssl.h

+8 −3
Original line number Diff line number Diff line
@@ -173,9 +173,14 @@ extern "C" { 
 */

# define SSL_DEFAULT_CIPHER_LIST "ALL:!COMPLEMENTOFDEFAULT:!eNULL"

/* This is the default set of TLSv1.3 ciphersuites */

# if !defined(OPENSSL_NO_CHACHA) && !defined(OPENSSL_NO_POLY1305)

#  define TLS_DEFAULT_CIPHERSUITES "TLS_AES_256_GCM_SHA384:" \

                                   "TLS_CHACHA20_POLY1305_SHA256:" \

                                   "TLS_AES_128_GCM_SHA256"

# else

#  define TLS_DEFAULT_CIPHERSUITES "TLS_AES_256_GCM_SHA384:" \

                                   "TLS_AES_128_GCM_SHA256"

#endif

/*

 * As of OpenSSL 1.0.0, ssl_create_cipher_list() in ssl/ssl_ciph.c always

 * starts with a reasonable order, and all we have to do for DEFAULT is