From 89979c595a7711925499db9045cdc25e330b9f36 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 16 Feb 2017 22:59:10 +0300 Subject: OpenSSL: dynamic dll loading removed --- plugins/OpenSSL/src/ssl_openssl.cpp | 30 +++++++----------------------- 1 file changed, 7 insertions(+), 23 deletions(-) (limited to 'plugins/OpenSSL/src/ssl_openssl.cpp') diff --git a/plugins/OpenSSL/src/ssl_openssl.cpp b/plugins/OpenSSL/src/ssl_openssl.cpp index 6f0791475b..6340fcf09d 100644 --- a/plugins/OpenSSL/src/ssl_openssl.cpp +++ b/plugins/OpenSSL/src/ssl_openssl.cpp @@ -59,16 +59,7 @@ static void SSL_library_unload(void) WaitForSingleObject(g_hSslMutex, INFINITE); - FreeLibrary(g_hOpenSSL); - g_hOpenSSL = NULL; - - FreeLibrary(g_hOpenSSLCrypto); - g_hOpenSSLCrypto = NULL; - FreeLibrary(g_hWinCrypt); - g_hWinCrypt = NULL; - bSslInitDone = false; - ReleaseMutex(g_hSslMutex); } @@ -80,20 +71,13 @@ static bool SSL_library_load(void) WaitForSingleObject(g_hSslMutex, INFINITE); - if (!bSslInitDone) { - g_hOpenSSLCrypto = LoadLibraryA("libeay32.dll"); - g_hOpenSSL = LoadLibraryA("ssleay32.dll"); - g_hWinCrypt = LoadLibraryA("crypt32.dll"); - if (g_hOpenSSL && g_hOpenSSLCrypto && g_hWinCrypt) { - // init OpenSSL - SSL_library_init(); - SSL_load_error_strings(); - CRYPTO_set_mem_functions(mir_calloc, mir_realloc, mir_free); - // FIXME check errors - - bSslInitDone = true; - } - else SSL_library_unload(); + if (!bSslInitDone) { // init OpenSSL + SSL_library_init(); + SSL_load_error_strings(); + CRYPTO_set_mem_functions(mir_calloc, mir_realloc, mir_free); + // FIXME check errors + + bSslInitDone = true; } return bSslInitDone; -- cgit v1.2.3