Fix buffer overflow in SSL_get_shared_ciphers() function.

[openssl.git] / ssl / ssl_algs.c

diff --git a/ssl/ssl_algs.c b/ssl/ssl_algs.c
index 1a41b9967cf4548580797ebc7663328a4a01d40f..052e939629807e891f5b3f9a3d84ce428a24e9d4 100644 (file)
--- 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
@@ -115,6 +120,8 @@ int SSL_library_init(void)
           be discarded safely */
        (void)SSL_COMP_get_compression_methods();
 #endif
+       /* initialize cipher/digest methods table */
+       ssl_load_ciphers();
        return(1);
        }