diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-09-11 12:29:37 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-09-18 10:12:23 +0200 |
| commit | bba169b984fdee72e7e727696ff0f921acae07e0 (patch) | |
| tree | 451e42894d79a879472afd55f0d85dbd9eaf6b95 /mysys_ssl | |
| parent | 031a0404e7b946179d0e8d155717b46d4547ab95 (diff) | |
| download | mariadb-git-bba169b984fdee72e7e727696ff0f921acae07e0.tar.gz | |
MDEV-12763 10.2 uses deprecated openssl 1.0 apis even with 1.1
Use OpenSSL 1.1 when applicable.
Create compatibility macros for OpenSSL 1.0- and YaSSL.
Diffstat (limited to 'mysys_ssl')
| -rw-r--r-- | mysys_ssl/my_crypt.cc | 2 | ||||
| -rw-r--r-- | mysys_ssl/my_md5.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mysys_ssl/my_crypt.cc b/mysys_ssl/my_crypt.cc index 6ad9171bfbc..92f4012d175 100644 --- a/mysys_ssl/my_crypt.cc +++ b/mysys_ssl/my_crypt.cc @@ -43,7 +43,7 @@ public: } virtual ~MyCTX() { - EVP_CIPHER_CTX_cleanup(ctx); + EVP_CIPHER_CTX_reset(ctx); ERR_remove_state(0); } diff --git a/mysys_ssl/my_md5.cc b/mysys_ssl/my_md5.cc index 0105082b7e1..582c83d0522 100644 --- a/mysys_ssl/my_md5.cc +++ b/mysys_ssl/my_md5.cc @@ -71,7 +71,7 @@ static void md5_input(EVP_MD_CTX *context, const uchar *buf, unsigned len) static void md5_result(EVP_MD_CTX *context, uchar digest[MD5_HASH_SIZE]) { EVP_DigestFinal_ex(context, digest, NULL); - EVP_MD_CTX_cleanup(context); + EVP_MD_CTX_reset(context); } #endif /* HAVE_YASSL */ |