diff options
| author | gluh@eagle.intranet.mysql.r18.ru <> | 2005-11-29 12:15:48 +0400 |
|---|---|---|
| committer | gluh@eagle.intranet.mysql.r18.ru <> | 2005-11-29 12:15:48 +0400 |
| commit | 4b6a94ffb4b7943ceb15795a2657551e5d406fcb (patch) | |
| tree | fea328bb12062463c9f64f3da8eeda094c4a17d4 /vio | |
| parent | f0c5aae5008c5002b734b550a9af0eb9658eb44b (diff) | |
| download | mariadb-git-4b6a94ffb4b7943ceb15795a2657551e5d406fcb.tar.gz | |
Fix for bug#14221 SSL support breaks going from OpenSSL 0.9.7i to 0.9.8a
added SSL_library_init()
Diffstat (limited to 'vio')
| -rw-r--r-- | vio/viosslfactories.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/vio/viosslfactories.c b/vio/viosslfactories.c index 498d10da0ee..46306cf48bb 100644 --- a/vio/viosslfactories.c +++ b/vio/viosslfactories.c @@ -191,9 +191,6 @@ void netware_ssl_cleanup() /* NetWare SSL initialization */ static void netware_ssl_init() { - /* initialize OpenSSL library */ - SSL_library_init(); - /* cleanup OpenSSL library */ NXVmRegisterExitHandler(netware_ssl_cleanup, NULL); } @@ -231,16 +228,17 @@ new_VioSSLConnectorFd(const char* key_file, ptr->ssl_method= 0; /* FIXME: constants! */ -#ifdef __NETWARE__ - netware_ssl_init(); -#endif - if (!ssl_algorithms_added) { DBUG_PRINT("info", ("todo: OpenSSL_add_all_algorithms()")); ssl_algorithms_added = TRUE; + SSL_library_init(); OpenSSL_add_all_algorithms(); } +#ifdef __NETWARE__ + netware_ssl_init(); +#endif + if (!ssl_error_strings_loaded) { DBUG_PRINT("info", ("todo:SSL_load_error_strings()")); @@ -325,17 +323,18 @@ new_VioSSLAcceptorFd(const char *key_file, /* FIXME: constants! */ ptr->session_id_context= ptr; -#ifdef __NETWARE__ - netware_ssl_init(); -#endif - if (!ssl_algorithms_added) { DBUG_PRINT("info", ("todo: OpenSSL_add_all_algorithms()")); ssl_algorithms_added = TRUE; + SSL_library_init(); OpenSSL_add_all_algorithms(); } +#ifdef __NETWARE__ + netware_ssl_init(); +#endif + if (!ssl_error_strings_loaded) { DBUG_PRINT("info", ("todo: SSL_load_error_strings()")); |