diff options
| author |   Thomas Deutschmann <whissi@gentoo.org> | 2018-10-17 14:23:42 +0200 |
|---|---|---|
| committer | Thomas Deutschmann <whissi@gentoo.org> | 2018-10-17 14:23:42 +0200 |
| commit | cfe842ed9596ea5bdd8e76636033116cc77cd213 (patch) | |
| tree | 416825659a050da13f3b31e340f70f63b33e20ad | |
| parent | Add 20018_all_percona-server-5.7.23-fix-libressl-support.patch (diff) | |
| download | mysql-extras-cfe842ed9596ea5bdd8e76636033116cc77cd213.tar.gz mysql-extras-cfe842ed9596ea5bdd8e76636033116cc77cd213.tar.bz2 mysql-extras-cfe842ed9596ea5bdd8e76636033116cc77cd213.zip | |
Update 20018_all_percona-server-5.7.23-fix-libressl-support.patchmysql-extras-20181017-1223Z
Bug: https://bugs.gentoo.org/668818
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
| -rw-r--r-- | 20018_all_percona-server-5.7.23-fix-libressl-support.patch | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/20018_all_percona-server-5.7.23-fix-libressl-support.patch b/20018_all_percona-server-5.7.23-fix-libressl-support.patch index a30dbc1..72d7a06 100644 --- a/20018_all_percona-server-5.7.23-fix-libressl-support.patch +++ b/20018_all_percona-server-5.7.23-fix-libressl-support.patch @@ -1,6 +1,19 @@ https://bugs.gentoo.org/662826 https://bugs.gentoo.org/668832 +https://bugs.gentoo.org/668818 +--- a/mysys_ssl/my_crypt.cc ++++ b/mysys_ssl/my_crypt.cc +@@ -95,7 +95,8 @@ MyEncryptionCTX::MyEncryptionCTX() + MyEncryptionCTX::~MyEncryptionCTX() + { + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) + EVP_CIPHER_CTX_cleanup(ctx); + delete ctx; + ERR_remove_thread_state(0); --- a/sql/auth/sha2_password_common.cc +++ b/sql/auth/sha2_password_common.cc @@ -146,7 +146,8 @@ bool SHA256_digest::retrieve_digest(unsigned char *digest, |