From 3d5a7578e09a984c6475b1c008f5c76f850328cb Mon Sep 17 00:00:00 2001 From: Shane Lontis Date: Wed, 16 Oct 2019 16:18:42 +1000 Subject: Add ChaCha related ciphers to default provider Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/10081) --- providers/defltprov.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'providers/defltprov.c') diff --git a/providers/defltprov.c b/providers/defltprov.c index 7dd0cf5012..2d457ae53f 100644 --- a/providers/defltprov.c +++ b/providers/defltprov.c @@ -295,6 +295,12 @@ static const OSSL_ALGORITHM deflt_ciphers[] = { { "RC2-CFB", "default=yes", rc2128cfb128_functions }, { "RC2-OFB", "default=yes", rc2128ofb128_functions }, #endif /* OPENSSL_NO_RC2 */ +#ifndef OPENSSL_NO_CHACHA + { "ChaCha20", "default=yes", chacha20_functions }, +# ifndef OPENSSL_NO_POLY1305 + { "ChaCha20-Poly1305", "default=yes", chacha20_poly1305_functions }, +# endif /* OPENSSL_NO_POLY1305 */ +#endif /* OPENSSL_NO_CHACHA */ { NULL, NULL, NULL } }; -- cgit v1.2.3