summaryrefslogtreecommitdiffstats
path: root/ssl/ssl_algs.c
diff options
context:
space:
mode:
authorBodo Möller <bodo@openssl.org>2006-06-09 15:44:59 +0000
committerBodo Möller <bodo@openssl.org>2006-06-09 15:44:59 +0000
commitf3dea9a5958b576345bae710c0acd2e52ecde0c8 (patch)
tree795c13bb1a22819cac949744a3dd5cc428270187 /ssl/ssl_algs.c
parentfb7b3932786e4277eb3235adc239686806cd9610 (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.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/ssl/ssl_algs.c b/ssl/ssl_algs.c
index ac82d45a9c..052e939629 100644
--- a/ssl/ssl_algs.c
+++ b/ssl/ssl_algs.c
@@ -82,6 +82,11 @@ int SSL_library_init(void)
EVP_add_cipher(EVP_aes_192_cbc());
EVP_add_cipher(EVP_aes_256_cbc());
#endif
+#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