commit: a9c411d5ee037b430376d6f302cbea405653b7f7 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> AuthorDate: Wed Oct 17 21:59:41 2018 +0000 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> CommitDate: Wed Oct 17 21:59:41 2018 +0000 URL: https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=a9c411d5
Update 20018_all_mysql-5.7.23-fix-libressl-support.patch Bug: https://bugs.gentoo.org/668894 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> 20018_all_mysql-5.7.23-fix-libressl-support.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/20018_all_mysql-5.7.23-fix-libressl-support.patch b/20018_all_mysql-5.7.23-fix-libressl-support.patch index c5ca308..6e4bd50 100644 --- a/20018_all_mysql-5.7.23-fix-libressl-support.patch +++ b/20018_all_mysql-5.7.23-fix-libressl-support.patch @@ -1,5 +1,6 @@ https://bugs.gentoo.org/662826 https://bugs.gentoo.org/668832 +https://bugs.gentoo.org/668894 --- a/sql/auth/sha2_password_common.cc +++ b/sql/auth/sha2_password_common.cc @@ -13,6 +14,18 @@ https://bugs.gentoo.org/668832 EVP_MD_CTX_cleanup(md_context); #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ EVP_MD_CTX_reset(md_context); +--- a/sql/mysqld.cc ++++ b/sql/mysqld.cc +@@ -3408,7 +3408,8 @@ static int init_ssl() + { + #ifdef HAVE_OPENSSL + #ifndef HAVE_YASSL +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) + CRYPTO_malloc_init(); + #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ + OPENSSL_malloc_init(); --- a/vio/viosslfactories.c +++ b/vio/viosslfactories.c @@ -121,21 +121,19 @@ static DH *get_dh2048(void)
