Commit 4c0d391c authored by Vladislav Vaintroub's avatar Vladislav Vaintroub

Windows : fix broken build with OpenSSL

parent 5a1868b5
...@@ -30,9 +30,9 @@ ...@@ -30,9 +30,9 @@
#define EVP_CIPHER_CTX_SIZE 176 #define EVP_CIPHER_CTX_SIZE 176
#define EVP_MD_CTX_SIZE 48 #define EVP_MD_CTX_SIZE 48
#undef EVP_MD_CTX_init #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 #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, Macros below are deprecated. OpenSSL 1.1 may define them or not,
......
Subproject commit b948553b3464d37240c4d129fae47ce147e6dabc Subproject commit 17d0e5317604718fc059ee1ad4bd2ea36494226b
...@@ -32,7 +32,8 @@ int check_openssl_compatibility() ...@@ -32,7 +32,8 @@ int check_openssl_compatibility()
#else #else
#include <openssl/evp.h> #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)), static void *coc_malloc(size_t size, const char *f __attribute__((unused)),
int l __attribute__((unused))) int l __attribute__((unused)))
......
...@@ -335,7 +335,7 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio, long timeout, ...@@ -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)); DBUG_PRINT("info", ("ssl: %p timeout: %ld", ssl, timeout));
SSL_clear(ssl); SSL_clear(ssl);
SSL_SESSION_set_timeout(SSL_get_session(ssl), timeout); 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 Since yaSSL does not support non-blocking send operations, use
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment