projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Hopefully resolve signed vs unsigned issue.
[oweals/openssl.git]
/
ssl
/
ssl_algs.c
diff --git
a/ssl/ssl_algs.c
b/ssl/ssl_algs.c
index 1a41b9967cf4548580797ebc7663328a4a01d40f..bd68999a5af3dc47d84c53963b7b6d2427fc9c2c 100644
(file)
--- 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
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
#ifndef OPENSSL_NO_MD2
EVP_add_digest(EVP_md2());
#endif
@@
-115,6
+124,8
@@
int SSL_library_init(void)
be discarded safely */
(void)SSL_COMP_get_compression_methods();
#endif
be discarded safely */
(void)SSL_COMP_get_compression_methods();
#endif
+ /* initialize cipher/digest methods table */
+ ssl_load_ciphers();
return(1);
}
return(1);
}