diff options
| author | Andy Polyakov <appro@openssl.org> | 2015-12-09 21:36:19 +0100 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2015-12-10 12:03:41 +0100 |
| commit | bd3385d84505eeb552a6125415607785f63c6d2d (patch) | |
| tree | 6b0e4c9b865a8fe897208b6b476f882ced313fb8 /crypto/evp | |
| parent | eb85cb8632ad5d868a5634b3ce18846ae351c380 (diff) | |
evp/c_allc.c: wire ChaCha20-Poly1305 and add tests.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'crypto/evp')
| -rw-r--r-- | crypto/evp/c_allc.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/crypto/evp/c_allc.c b/crypto/evp/c_allc.c index ff4cffc531..49f4c66a67 100644 --- a/crypto/evp/c_allc.c +++ b/crypto/evp/c_allc.c @@ -256,4 +256,11 @@ void OpenSSL_add_all_ciphers(void) EVP_add_cipher(EVP_camellia_192_ctr()); EVP_add_cipher(EVP_camellia_256_ctr()); #endif + +#ifndef OPENSSL_NO_CHACHA + EVP_add_cipher(EVP_chacha20()); +# ifndef OPENSSL_NO_POLY1305 + EVP_add_cipher(EVP_chacha20_poly1305()); +# endif +#endif } |