From: Matt Caswell Date: Thu, 15 Mar 2018 08:45:22 +0000 (+0000) Subject: Fix no-chacha and no-poly1305 X-Git-Tag: OpenSSL_1_1_1-pre3~68 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7731e619fba2f9ea1e888bf906289be37c52e6ac;p=oweals%2Fopenssl.git Fix no-chacha and no-poly1305 Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/5623) --- diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h index 0679ada3de..bb64fe04e8 100644 --- a/include/openssl/ssl.h +++ b/include/openssl/ssl.h @@ -173,9 +173,14 @@ extern "C" { */ # define SSL_DEFAULT_CIPHER_LIST "ALL:!COMPLEMENTOFDEFAULT:!eNULL" /* This is the default set of TLSv1.3 ciphersuites */ -# define TLS_DEFAULT_CIPHERSUITES "TLS_AES_256_GCM_SHA384:" \ - "TLS_CHACHA20_POLY1305_SHA256:" \ - "TLS_AES_128_GCM_SHA256" +# 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