From 1b2aa7959c86a835491c8cfca8c0683b747c1855 Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Mon, 9 Oct 2006 16:29:05 +0000 Subject: Merge in vendor branch OpenSSL changes 0.9.8b -> 0.9.8d svn path=/openssl/vendor/current/CHANGES; revision=375 --- openssl/vendor/current/ssl/ssl_algs.c | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'openssl/vendor/current/ssl/ssl_algs.c') diff --git a/openssl/vendor/current/ssl/ssl_algs.c b/openssl/vendor/current/ssl/ssl_algs.c index ac82d45a..3d93c5ab 100644 --- a/openssl/vendor/current/ssl/ssl_algs.c +++ b/openssl/vendor/current/ssl/ssl_algs.c @@ -82,6 +82,15 @@ int SSL_library_init(void) EVP_add_cipher(EVP_aes_192_cbc()); EVP_add_cipher(EVP_aes_256_cbc()); #endif + + +/* The Camellia algorithm is registered in the management table of EVP. */ +#ifndef OPENSSL_NO_CAMELLIA + EVP_add_cipher(EVP_camellia_128_cbc()); + EVP_add_cipher(EVP_camellia_256_cbc()); +#endif + + #ifndef OPENSSL_NO_MD2 EVP_add_digest(EVP_md2()); #endif -- cgit v1.2.3