diff options
| -rw-r--r-- | include/ssl_compat.h | 4 | ||||
| m--------- | libmariadb | 0 | ||||
| -rw-r--r-- | mysys_ssl/openssl.c | 3 | ||||
| -rw-r--r-- | vio/viossl.c | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/include/ssl_compat.h b/include/ssl_compat.h index 2777ae94527..c94b9671d5f 100644 --- 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 -Subproject b948553b3464d37240c4d129fae47ce147e6dab +Subproject 17d0e5317604718fc059ee1ad4bd2ea36494226 diff --git a/mysys_ssl/openssl.c b/mysys_ssl/openssl.c index 2cf37caccbb..e0f3d646ca9 100644 --- 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 index 000a526a892..b3e2bca6676 100644 --- 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 |