3 files changed, 29 insertions, 1 deletions
diff --git a/databases/mysql56-server/files/patch-cmake_ssl.cmake b/databases/mysql56-server/files/patch-cmake_ssl.cmake
index c2b31170ba4c..52db9e37d987 100644
--- a/databases/mysql56-server/files/patch-cmake_ssl.cmake
+++ b/databases/mysql56-server/files/patch-cmake_ssl.cmake
@@ -5,9 +5,10 @@
          )
      ENDIF()
 -    IF("${OPENSSL_MAJOR_VERSION}.${OPENSSL_MINOR_VERSION}.${OPENSSL_FIX_VERSION}" VERSION_GREATER "1.1.0")
+-       ADD_DEFINITIONS(-DHAVE_TLSv13)
 +    CHECK_SYMBOL_EXISTS(TLS1_3_VERSION "openssl/tls1.h" HAVE_TLS1_3_VERSION)
 +    IF(HAVE_TLS1_3_VERSION)
-        ADD_DEFINITIONS(-DHAVE_TLSv13)
++       #ADD_DEFINITIONS(-DHAVE_TLSv13)
      ENDIF()
      IF(OPENSSL_INCLUDE_DIR AND
         OPENSSL_LIBRARY   AND
diff --git a/databases/mysql56-server/files/patch-vio_viossl.c b/databases/mysql56-server/files/patch-vio_viossl.c
index 3180abbd7f0f..54a6280525fc 100644
--- a/databases/mysql56-server/files/patch-vio_viossl.c
+++ b/databases/mysql56-server/files/patch-vio_viossl.c
@@ -1,5 +1,14 @@
 --- vio/viossl.c.orig	2019-11-26 16:53:45 UTC
 +++ vio/viossl.c
+@@ -385,7 +385,7 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio,
+   DBUG_PRINT("info", ("ssl: 0x%lx timeout: %ld", (long) ssl, timeout));
+   SSL_clear(ssl);
+   SSL_set_fd(ssl, sd);
+-#if defined(SSL_OP_NO_COMPRESSION)
++#if defined(SSL_OP_NO_COMPRESSION) && !defined(LIBRESSL_VERSION_NUMBER)
+   SSL_set_options(ssl, SSL_OP_NO_COMPRESSION); /* OpenSSL >= 1.0 only */
+ #elif OPENSSL_VERSION_NUMBER >= 0x00908000L /* workaround for OpenSSL 0.9.8 */
+   sk_SSL_COMP_zero(SSL_COMP_get_compression_methods());
 @@ -403,7 +403,7 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio,
        for (j = 0; j < n; j++)
        {
diff --git a/databases/mysql56-server/files/patch-vio_viosslfactories.c b/databases/mysql56-server/files/patch-vio_viosslfactories.c
index d6a164910a0d..dd1293395898 100644
--- a/databases/mysql56-server/files/patch-vio_viosslfactories.c
+++ b/databases/mysql56-server/files/patch-vio_viosslfactories.c
@@ -9,6 +9,15 @@
      dh->p= p;
      dh->g= g;
  #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
+@@ -226,7 +226,7 @@ new_VioSSLFd(const char *key_file, const char *cert_fi
+   struct st_VioSSLFd *ssl_fd;
+   /* MySQL 5.6 supports TLS up to v1.2, explicitly disable TLSv1.3. */
+   long ssl_ctx_options= SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 |
+-#ifdef HAVE_TLSv13
++#if defined(HAVE_TLSv13) && !defined(LIBRESSL_VERSION_NUMBER)
+                         SSL_OP_NO_TLSv1_3 |
+ #endif /* HAVE_TLSv13 */
+                         SSL_OP_NO_TICKET;
 @@ -250,7 +250,7 @@ new_VioSSLFd(const char *key_file, const char *cert_fi
      DBUG_RETURN(0);
  
@@ -18,3 +27,12 @@
                                           SSLv23_client_method() :
                                           SSLv23_server_method()
  #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
+@@ -268,7 +268,7 @@ new_VioSSLFd(const char *key_file, const char *cert_fi
+ 
+   SSL_CTX_set_options(ssl_fd->ssl_context, ssl_ctx_options);
+ 
+-#ifdef HAVE_TLSv13
++#if defined(HAVE_TLSv13) && !defined(LIBRESSL_VERSION_NUMBER)
+   /*
+     MySQL 5.6 doesn't support TLSv1.3 - set empty TLSv1.3 ciphersuites.
+   */