From 77d051e89d0b342333d951e66e53f2aea43f6e36 Mon Sep 17 00:00:00 2001
From: Georg Richter <georg@mariadb.com>
Date: Tue, 16 Jul 2019 08:52:24 +0200
Subject: [PATCH] Windows build fixes for OpenSSL

---
 CMakeLists.txt                    | 6 +++++-
 include/ma_config.h.in            | 1 +
 libmariadb/secure/openssl.c       | 4 ++++
 libmariadb/secure/openssl_crypt.c | 1 +
 unittest/libmariadb/my_test.h     | 2 ++
 5 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0f37bb58..2edc9e6a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -279,7 +279,7 @@ IF(WITH_SSL STREQUAL "ON")
   IF(WIN32)
     SET(WITH_SSL "SCHANNEL")
   ELSE()
-    SET(WITH_SSL "OPENSSL")
+    SET(WITH_SSL "PENSSL")
   ENDIF()
 ENDIF()
 
@@ -292,8 +292,12 @@ IF(NOT WITH_SSL STREQUAL "OFF")
       ADD_DEFINITIONS(-DHAVE_OPENSSL -DHAVE_TLS)
       SET(SSL_SOURCES "${CC_SOURCE_DIR}/libmariadb/secure/openssl.c")
       SET(SSL_LIBRARIES ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY})
+      IF(WIN32)
+        CHECK_INCLUDE_FILES (${OPENSSL_INCLUDE_DIR}/openssl/applink.c HAVE_OPENSSL_APPLINK_C)
+      ENDIF()
       INCLUDE_DIRECTORIES(BEFORE ${OPENSSL_INCLUDE_DIR})
 
+
       TRY_RUN(LIBRESSL_RESULT HAVE_LIBRESSL
               ${CMAKE_BINARY_DIR}
               ${CC_SOURCE_DIR}/cmake/libressl_version.c
diff --git a/include/ma_config.h.in b/include/ma_config.h.in
index 8f12ee67..8d462e9e 100644
--- a/include/ma_config.h.in
+++ b/include/ma_config.h.in
@@ -2,6 +2,7 @@
 /*
  * Include file constants (processed in LibmysqlIncludeFiles.txt 1
  */
+#cmakedefine HAVE_OPENSSL_APPLINK_C 1
 #cmakedefine HAVE_ALLOCA_H 1
 #cmakedefine HAVE_BIGENDIAN 1
 #cmakedefine HAVE_SETLOCALE 1
diff --git a/libmariadb/secure/openssl.c b/libmariadb/secure/openssl.c
index 41d50460..ac982698 100644
--- a/libmariadb/secure/openssl.c
+++ b/libmariadb/secure/openssl.c
@@ -30,6 +30,10 @@
 #include <openssl/conf.h>
 #include <openssl/md4.h>
 
+#if defined(_WIN32) && !defined(_OPENSSL_Applink) && defined(HAVE_OPENSSL_APPLINK_C)
+#include <openssl/applink.c>
+#endif
+
 #if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
 #include <openssl/x509v3.h>
 #define HAVE_OPENSSL_CHECK_HOST 1
diff --git a/libmariadb/secure/openssl_crypt.c b/libmariadb/secure/openssl_crypt.c
index ff885c59..01d41a90 100644
--- a/libmariadb/secure/openssl_crypt.c
+++ b/libmariadb/secure/openssl_crypt.c
@@ -16,6 +16,7 @@
    or write to the Free Software Foundation, Inc.,
    51 Franklin St., Fifth Floor, Boston, MA 02110, USA
 */
+#include <ma_global.h>
 #include <ma_crypt.h>
 #include <openssl/evp.h>
 
diff --git a/unittest/libmariadb/my_test.h b/unittest/libmariadb/my_test.h
index 0aa673cf..feb10400 100644
--- a/unittest/libmariadb/my_test.h
+++ b/unittest/libmariadb/my_test.h
@@ -34,6 +34,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #ifndef WIN32
 #include <pthread.h>
+#else
+#include <io.h>
 #endif
 
 #ifndef OK