Windows : fix broken build with OpenSSL

MariaDB · Sep 8, 2018 · 4c0d391 · 4c0d391
1 parent 5a1868b
commit 4c0d391
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/include/ssl_compat.h b/include/ssl_compat.h
@@ -30,9 +30,9 @@
 #define EVP_CIPHER_CTX_SIZE 176
 #define EVP_MD_CTX_SIZE 48
 #undef EVP_MD_CTX_init
-#define EVP_MD_CTX_init(X) do { bzero((X), EVP_MD_CTX_SIZE); EVP_MD_CTX_reset(X); } while(0)
+#define EVP_MD_CTX_init(X) do { memset((X), 0, EVP_MD_CTX_SIZE); EVP_MD_CTX_reset(X); } while(0)
 #undef EVP_CIPHER_CTX_init
-#define EVP_CIPHER_CTX_init(X) do { bzero((X), EVP_CIPHER_CTX_SIZE); EVP_CIPHER_CTX_reset(X); } while(0)
+#define EVP_CIPHER_CTX_init(X) do { memset((X), 0, EVP_CIPHER_CTX_SIZE); EVP_CIPHER_CTX_reset(X); } while(0)
 
 /*
   Macros below are deprecated. OpenSSL 1.1 may define them or not,

diff --git a/libmariadb b/libmariadb
diff --git a/mysys_ssl/openssl.c b/mysys_ssl/openssl.c
@@ -32,7 +32,8 @@ int check_openssl_compatibility()
 #else
 #include <openssl/evp.h>
 
-static uint testing, alloc_size, alloc_count;
+static uint testing;
+size_t alloc_size, alloc_count;
 
 static void *coc_malloc(size_t size, const char *f __attribute__((unused)),
                                              int l __attribute__((unused)))

diff --git a/vio/viossl.c b/vio/viossl.c
@@ -335,7 +335,7 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio, long timeout,
   DBUG_PRINT("info", ("ssl: %p timeout: %ld", ssl, timeout));
   SSL_clear(ssl);
   SSL_SESSION_set_timeout(SSL_get_session(ssl), timeout);
-  SSL_set_fd(ssl, sd);
+  SSL_set_fd(ssl, (int)sd);
 
   /*
     Since yaSSL does not support non-blocking send operations, use