WL 13162 Support OpenSSL 1.1

Author: Bogdan Degtyariov

cdk/cmake/DepFindSSL.cmake

@@ -226,13 +226,13 @@ function(find_openssl)
 
 
   find_library(OPENSSL_LIBRARY
-    NAMES ssl ssleay32 ssleay32MD
+    NAMES ssl ssleay32 ssleay32MD libssl
     PATH_SUFFIXES lib
     ${hints}
   )
 
   find_library(CRYPTO_LIBRARY
-    NAMES crypto libeay32 libeay32MD
+    NAMES crypto libeay32 libeay32MD libcrypto
     PATH_SUFFIXES lib
     ${hints}
   )

cdk/foundation/connection_openssl.cc

@@ -55,6 +55,24 @@ POP_SYS_WARNINGS_CDK
 #include "connection_tcpip_base.h"
 
 
+/*
+  On Windows, external dependencies can be declared using
+  #pragma comment directive.
+*/
+
+#ifdef _WIN32
+  #pragma comment(lib,"ws2_32")
+  #if defined(WITH_SSL) && !defined(WITH_SSL_WOLFSSL)
+    #if OPENSSL_VERSION_NUMBER < 0x10100000L
+      #pragma comment(lib,"ssleay32")
+      #pragma comment(lib,"libeay32")
+    #else
+      #pragma comment(lib,"libssl")
+      #pragma comment(lib,"libcrypto")
+    #endif
+  #endif
+#endif
+
 #ifdef WITH_SSL_WOLFSSL
 static const char* tls_ciphers_list="RC4-SHA:RC4-MD5:DES-CBC3-SHA:AES128-SHA:AES256-SHA:"
                                     "NULL-SHA:NULL-SHA256:"

cdk/include/mysql/cdk.h

@@ -38,20 +38,6 @@
 #include "cdk/cursor.h"
 #include "cdk/codec.h"
 
-/*
-  On Windows, external dependencies can be declared using
-  #pragma comment directive.
-*/
-
-#ifdef _WIN32
-#pragma comment(lib,"ws2_32")
-#if defined(WITH_SSL) && !defined(WITH_SSL_WOLFSSL)
-  #pragma comment(lib,"ssleay32")
-  #pragma comment(lib,"libeay32")
-#endif
-#endif
-
-
 namespace cdk {
 
 typedef Cursor::Row_processor Row_processor;