diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-09-11 21:31:47 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-09-11 21:31:47 +0300 |
| commit | 67fa97dc2c44f974bb26bba8a0efa3bb409e6bc5 (patch) | |
| tree | 5bbb79933755b9c8b8ea79af304e7d196f64e809 /include | |
| parent | 1bf3e8ab43e982953d7534db902020d321364afb (diff) | |
| parent | 6b61f1bbad1a57509d1cd0c09e80e31fffcfc67d (diff) | |
| download | mariadb-git-67fa97dc2c44f974bb26bba8a0efa3bb409e6bc5.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'include')
| -rw-r--r-- | include/ssl_compat.h | 4 |
1 files changed, 2 insertions, 2 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, |