mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 05:22:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge mysql.com:/home/gluh/MySQL/Merge/4.1

Browse source 
into mysql.com:/home/gluh/MySQL/Merge/5.0
This commit is contained in:
gluh@mysql.com 2005-11-30 21:29:31 +04:00
commit c2a9d3bf70
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
vio/viosslfactories.c
View file

@ -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);
} }
@ -228,16 +225,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()"));
@ -319,17 +317,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()"));