summaryrefslogtreecommitdiffstats
path: root/ssl/ssl_algs.c
diff options
context:
space:
mode:
authorBodo Möller <bodo@openssl.org>2006-06-09 15:42:21 +0000
committerBodo Möller <bodo@openssl.org>2006-06-09 15:42:21 +0000
commite18eef3d7ab9a6b4f229d95c8d32d25c66243103 (patch)
tree92f77102b848b7c55a29e1a63b8c6d9dfd8781ac /ssl/ssl_algs.c
parente78fc11a9587091d639473f3c2c68882223418d8 (diff)
Camellia cipher, contributed by NTT
Submitted by: Masashi Fujita Reviewed by: Bodo Moeller
Diffstat (limited to 'ssl/ssl_algs.c')
-rw-r--r--ssl/ssl_algs.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/ssl/ssl_algs.c b/ssl/ssl_algs.c
index ac82d45a9c..3d93c5ab78 100644
--- a/ssl/ssl_algs.c
+++ b/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