X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=ssl%2Fssl_algs.c;h=bd68999a5af3dc47d84c53963b7b6d2427fc9c2c;hb=c7ba21493a193d65745f9765a19522bcafa43336;hp=7c8a451fc56c8d0c4e9d83563e82449121583316;hpb=ea262260469e49149cb10b25a87dfd6ad3fbb4ba;p=oweals%2Fopenssl.git

diff --git a/ssl/ssl_algs.c b/ssl/ssl_algs.c
index 7c8a451fc5..bd68999a5a 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
+#ifndef OPENSSL_NO_CAMELLIA
+	EVP_add_cipher(EVP_camellia_128_cbc());
+	EVP_add_cipher(EVP_camellia_256_cbc());
+#endif
+
+#ifndef OPENSSL_NO_SEED
+	EVP_add_cipher(EVP_seed_cbc());
+#endif
+  
 #ifndef OPENSSL_NO_MD2
 	EVP_add_digest(EVP_md2());
 #endif
@@ -109,6 +118,14 @@ int SSL_library_init(void)
 	EVP_add_digest(EVP_sha());
 	EVP_add_digest(EVP_dss());
 #endif
+#ifndef OPENSSL_NO_COMP
+	/* This will initialise the built-in compression algorithms.
+	   The value returned is a STACK_OF(SSL_COMP), but that can
+	   be discarded safely */
+	(void)SSL_COMP_get_compression_methods();
+#endif
+	/* initialize cipher/digest methods table */
+	ssl_load_ciphers();
 	return(1);
 	}