summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Deutschmann <whissi@gentoo.org>2018-10-17 23:58:22 +0200
committerThomas Deutschmann <whissi@gentoo.org>2018-10-17 23:58:22 +0200
commit3098bcea9e263bcc864956ccaf551ad9f540e150 (patch)
tree132e62965a3a91908e8405cddb11ab830b354dbe
parentUpdate 20018_all_percona-server-5.7.23-fix-libressl-support.patch (diff)
downloadmysql-extras-3098bcea9e263bcc864956ccaf551ad9f540e150.tar.gz
mysql-extras-3098bcea9e263bcc864956ccaf551ad9f540e150.tar.bz2
mysql-extras-3098bcea9e263bcc864956ccaf551ad9f540e150.zip
Update 20018_all_percona-server-5.7.23-fix-libressl-support.patch
Bug: https://bugs.gentoo.org/668894 Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
-rw-r--r--20018_all_percona-server-5.7.23-fix-libressl-support.patch13
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 72d7a06..f368f57 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,7 @@
https://bugs.gentoo.org/662826
https://bugs.gentoo.org/668832
https://bugs.gentoo.org/668818
+https://bugs.gentoo.org/668894
--- a/mysys_ssl/my_crypt.cc
+++ b/mysys_ssl/my_crypt.cc
@@ -26,6 +27,18 @@ https://bugs.gentoo.org/668818
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
+@@ -3679,7 +3679,8 @@ static int init_ssl()
+ " Disabling FIPS.");
+ FIPS_mode_set(0);
+ }
+-#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
@@ -123,7 +123,7 @@ static DH *get_dh2048(void)