[patch] Update-LibreSSL-patch-for-percona-server.patch

Update-LibreSSL-patch-for-percona-server.patch (text/plain), 2.13 KB, created by Stefan Strogin on 2019-05-22 03:58:56 UTC

From a5afe40bdc25dc89c39fc655991e20793dbc4f93 Mon Sep 17 00:00:00 2001
From: Stefan Strogin <[e-mail]>
Date: Wed, 22 May 2019 06:55:50 +0300
Subject: [PATCH] Update LibreSSL patch for percona-server

Closes: https://bugs.gentoo.org/669216
Signed-off-by: Stefan Strogin <[e-mail]>
---
 ...a-server-5.7.25-fix-libressl-support.patch | 23 +++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/20018_all_percona-server-5.7.25-fix-libressl-support.patch b/20018_all_percona-server-5.7.25-fix-libressl-support.patch
index 8ff17b9..c147bf0 100644
--- a/20018_all_percona-server-5.7.25-fix-libressl-support.patch
+++ b/20018_all_percona-server-5.7.25-fix-libressl-support.patch
@@ -2,9 +2,19 @@ https://bugs.gentoo.org/662826
 https://bugs.gentoo.org/668832
 https://bugs.gentoo.org/668818
 https://bugs.gentoo.org/668894
+https://bugs.gentoo.org/669216
 
 --- a/mysys_ssl/my_crypt.cc
 +++ b/mysys_ssl/my_crypt.cc
+@@ -30,7 +30,7 @@
+ #include <boost/move/unique_ptr.hpp>
+ #include <boost/core/noncopyable.hpp>
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ #define EVP_CIPHER_CTX_buf_noconst(ctx) ((ctx)->buf)
+ #define RAND_OpenSSL() RAND_SSLeay()
+ #endif
 @@ -95,7 +95,8 @@ MyEncryptionCTX::MyEncryptionCTX()
  MyEncryptionCTX::~MyEncryptionCTX()
  {
@@ -29,13 +39,22 @@ https://bugs.gentoo.org/668894
    EVP_MD_CTX_reset(md_context);
 --- a/sql/mysqld.cc
 +++ b/sql/mysqld.cc
-@@ -3679,7 +3679,8 @@ static int init_ssl()
+@@ -3678,6 +3678,7 @@ static int init_ssl()
+ {
+ #ifdef HAVE_OPENSSL
+ #ifndef HAVE_YASSL
++#ifndef LIBRESSL_VERSION_NUMBER
+   int fips_mode= FIPS_mode();
+   if (fips_mode != 0)
+   {
+@@ -3687,7 +3688,9 @@ static int init_ssl()
          " Disabling FIPS.");
      FIPS_mode_set(0);
    }
 -#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#endif
 +#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
-+    (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x02090000fL)
++    defined(LIBRESSL_VERSION_NUMBER)
    CRYPTO_malloc_init();
  #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
    OPENSSL_malloc_init();
-- 
2.21.0