aboutsummaryrefslogtreecommitdiff
path: root/openssl/trunk/ssl/ssl_algs.c
diff options
context:
space:
mode:
Diffstat (limited to 'openssl/trunk/ssl/ssl_algs.c')
-rw-r--r--openssl/trunk/ssl/ssl_algs.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/openssl/trunk/ssl/ssl_algs.c b/openssl/trunk/ssl/ssl_algs.c
index ac82d45a..3d93c5ab 100644
--- a/openssl/trunk/ssl/ssl_algs.c
+++ b/openssl/trunk/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