diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2019-10-16 16:18:42 +1000 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2019-10-16 16:18:42 +1000 |
| commit | 3d5a7578e09a984c6475b1c008f5c76f850328cb (patch) | |
| tree | 0ec32eba328e21a6e1face34415c67dcdce365c2 /providers/defltprov.c | |
| parent | 64fd90fbe99dde18de3fc7c3a6b06793d87a4aad (diff) | |
Add ChaCha related ciphers to default provider
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10081)
Diffstat (limited to 'providers/defltprov.c')
| -rw-r--r-- | providers/defltprov.c | 6 |
1 files changed, 6 insertions, 0 deletions
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 } }; |