summaryrefslogtreecommitdiff
path: root/mysys_ssl/my_crypt.cc
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2017-09-11 12:29:37 +0200
committerSergei Golubchik <serg@mariadb.org>2017-09-18 10:12:23 +0200
commitbba169b984fdee72e7e727696ff0f921acae07e0 (patch)
tree451e42894d79a879472afd55f0d85dbd9eaf6b95 /mysys_ssl/my_crypt.cc
parent031a0404e7b946179d0e8d155717b46d4547ab95 (diff)
downloadmariadb-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/my_crypt.cc')
-rw-r--r--mysys_ssl/my_crypt.cc2
1 files changed, 1 insertions, 1 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);
}