Fix for bug#14221 SSL support breaks going from OpenSSL 0.9.7i to 0.9.8a

  added SSL_library_init()
parent f0c5aae5
...@@ -191,9 +191,6 @@ void netware_ssl_cleanup() ...@@ -191,9 +191,6 @@ void netware_ssl_cleanup()
/* NetWare SSL initialization */ /* NetWare SSL initialization */
static void netware_ssl_init() static void netware_ssl_init()
{ {
/* initialize OpenSSL library */
SSL_library_init();
/* cleanup OpenSSL library */ /* cleanup OpenSSL library */
NXVmRegisterExitHandler(netware_ssl_cleanup, NULL); NXVmRegisterExitHandler(netware_ssl_cleanup, NULL);
} }
...@@ -231,16 +228,17 @@ new_VioSSLConnectorFd(const char* key_file, ...@@ -231,16 +228,17 @@ new_VioSSLConnectorFd(const char* key_file,
ptr->ssl_method= 0; ptr->ssl_method= 0;
/* FIXME: constants! */ /* FIXME: constants! */
#ifdef __NETWARE__
netware_ssl_init();
#endif
if (!ssl_algorithms_added) if (!ssl_algorithms_added)
{ {
DBUG_PRINT("info", ("todo: OpenSSL_add_all_algorithms()")); DBUG_PRINT("info", ("todo: OpenSSL_add_all_algorithms()"));
ssl_algorithms_added = TRUE; ssl_algorithms_added = TRUE;
SSL_library_init();
OpenSSL_add_all_algorithms(); OpenSSL_add_all_algorithms();
} }
#ifdef __NETWARE__
netware_ssl_init();
#endif
if (!ssl_error_strings_loaded) if (!ssl_error_strings_loaded)
{ {
DBUG_PRINT("info", ("todo:SSL_load_error_strings()")); DBUG_PRINT("info", ("todo:SSL_load_error_strings()"));
...@@ -325,17 +323,18 @@ new_VioSSLAcceptorFd(const char *key_file, ...@@ -325,17 +323,18 @@ new_VioSSLAcceptorFd(const char *key_file,
/* FIXME: constants! */ /* FIXME: constants! */
ptr->session_id_context= ptr; ptr->session_id_context= ptr;
#ifdef __NETWARE__
netware_ssl_init();
#endif
if (!ssl_algorithms_added) if (!ssl_algorithms_added)
{ {
DBUG_PRINT("info", ("todo: OpenSSL_add_all_algorithms()")); DBUG_PRINT("info", ("todo: OpenSSL_add_all_algorithms()"));
ssl_algorithms_added = TRUE; ssl_algorithms_added = TRUE;
SSL_library_init();
OpenSSL_add_all_algorithms(); OpenSSL_add_all_algorithms();
} }
#ifdef __NETWARE__
netware_ssl_init();
#endif
if (!ssl_error_strings_loaded) if (!ssl_error_strings_loaded)
{ {
DBUG_PRINT("info", ("todo: SSL_load_error_strings()")); DBUG_PRINT("info", ("todo: SSL_load_error_strings()"));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment