From 17d0e5317604718fc059ee1ad4bd2ea36494226b Mon Sep 17 00:00:00 2001
From: Vladislav Vaintroub <wlad@mariadb.com>
Date: Sat, 8 Sep 2018 15:47:17 +0100
Subject: [PATCH] Fix broken build with Windows OpenSSL.

---
 libmariadb/secure/openssl.c | 12 ++++++------
 plugins/auth/CMakeLists.txt |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/libmariadb/secure/openssl.c b/libmariadb/secure/openssl.c
index 79479ab31..943c19f4b 100644
--- a/libmariadb/secure/openssl.c
+++ b/libmariadb/secure/openssl.c
@@ -443,7 +443,7 @@ int ma_tls_get_password(char *buf, int size,
   memset(buf, 0, size);
   if (userdata)
     strncpy(buf, (char *)userdata, size);
-  return strlen(buf);
+  return (int)strlen(buf);
 }
 
 
@@ -623,7 +623,7 @@ my_bool ma_tls_connect(MARIADB_TLS *ctls)
   SSL_set_bio(ssl, bio, bio);
   BIO_set_fd(bio, mysql_get_socket(mysql), BIO_NOCLOSE);
 #else
-  SSL_set_fd(ssl, mysql_get_socket(mysql));
+  SSL_set_fd(ssl, (int)mysql_get_socket(mysql));
 #endif
 
   while (try_connect && (rc= SSL_connect(ssl)) == -1)
@@ -700,7 +700,7 @@ ssize_t ma_tls_read_async(MARIADB_PVIO *pvio,
 
   for (;;)
   {
-    res= SSL_read((SSL *)ctls->ssl, (void *)buffer, length);
+    res= SSL_read((SSL *)ctls->ssl, (void *)buffer, (int)length);
     if (ma_tls_async_check_result(res, b, (SSL *)ctls->ssl))
       return res;
   }
@@ -716,7 +716,7 @@ ssize_t ma_tls_write_async(MARIADB_PVIO *pvio,
 
   for (;;)
   {
-    res= SSL_write((SSL *)ctls->ssl, (void *)buffer, length);
+    res= SSL_write((SSL *)ctls->ssl, (void *)buffer, (int)length);
     if (ma_tls_async_check_result(res, b, (SSL *)ctls->ssl))
       return res;
   }
@@ -725,7 +725,7 @@ ssize_t ma_tls_write_async(MARIADB_PVIO *pvio,
 
 ssize_t ma_tls_read(MARIADB_TLS *ctls, const uchar* buffer, size_t length)
 {
-  ssize_t rc;
+  int rc;
   MARIADB_PVIO *pvio= ctls->pvio;
 
   while ((rc= SSL_read((SSL *)ctls->ssl, (void *)buffer, (int)length)) < 0)
@@ -741,7 +741,7 @@ ssize_t ma_tls_read(MARIADB_TLS *ctls, const uchar* buffer, size_t length)
 
 ssize_t ma_tls_write(MARIADB_TLS *ctls, const uchar* buffer, size_t length)
 {
-  ssize_t rc;
+  int rc;
   MARIADB_PVIO *pvio= ctls->pvio;
 
   while ((rc= SSL_write((SSL *)ctls->ssl, (void *)buffer, (int)length)) <= 0)
diff --git a/plugins/auth/CMakeLists.txt b/plugins/auth/CMakeLists.txt
index 1d40a34ec..99548dc23 100644
--- a/plugins/auth/CMakeLists.txt
+++ b/plugins/auth/CMakeLists.txt
@@ -39,7 +39,7 @@ IF(GSSAPI_SOURCES)
 ENDIF()
 
 IF(${WITH_SSL} STREQUAL "OPENSSL" OR ${WITH_SSL} STREQUAL "SCHANNEL")
-  IF(WIN32)
+  IF(WITH_SSL STREQUAL "SCHANNEL")
     SET(SHA256_LIBS crypt32)
   ELSE()
     SET(SHA256_LIBS ${SSL_LIBRARIES})