Commit 5d7b85e5 authored by unknown's avatar unknown
Browse files

Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 

into mysql.com:/home/gluh/MySQL/Merge/4.1
parents 0fa8fc66 9e33fc73

vio/viosslfactories.c

+10 −11
Original line number Diff line number Diff line
@@ -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()"));