Attachment 211857 Details for Bug 244320 – svn diff for databases/mysql57-client

[patch] svn diff for databases/mysql57-client

patch-databases_mysql57-client-5.7.29-LibreSSL (text/plain), 3.27 KB, created by Bernard Spil on 2020-02-23 14:37:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bernard Spil

Created: 2020-02-23 14:37:56 UTC

Size: 3.27 KB

patch

obsolete

>Index: databases/mysql57-client/files/patch-rapid_plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_xcom__ssl__transport.c
>===================================================================
>--- databases/mysql57-client/files/patch-rapid_plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_xcom__ssl__transport.c	(nonexistent)
>+++ databases/mysql57-client/files/patch-rapid_plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_xcom__ssl__transport.c	(working copy)
>@@ -0,0 +1,29 @@
>+--- rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.c.orig	2019-12-18 12:59:40 UTC
>++++ rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.c
>+@@ -232,7 +232,7 @@ static int configure_ssl_algorithms(SSL_CTX* ssl_ctx, 
>+                                     const char* tls_version)
>+ {
>+   DH *dh= NULL;
>+-#ifdef HAVE_TLSv13
>++#ifdef SSL_OP_NO_TLSv1_3
>+   /* We support TLS up to 1.2, so explicitly disable TLS 1.3. */
>+   long ssl_ctx_options= SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_NO_TLSv1_3;
>+ #else
>+@@ -257,14 +257,14 @@ static int configure_ssl_algorithms(SSL_CTX* ssl_ctx, 
>+                     SSL_OP_NO_TLSv1 |
>+                     SSL_OP_NO_TLSv1_1
>+                     | SSL_OP_NO_TLSv1_2
>+-#ifdef HAVE_TLSv13
>++#ifdef SSL_OP_NO_TLSv1_3
>+                     | SSL_OP_NO_TLSv1_3
>+-#endif /* HAVE_TLSv13 */
>++#endif /* SSL_OP_NO_TLSv1_3 */
>+                    );
>+ 
>+   SSL_CTX_set_options(ssl_ctx, ssl_ctx_options);
>+ 
>+-#ifdef HAVE_TLSv13
>++#if defined(HAVE_TLSv13) && !defined(LIBRESSL_VERSION_NUMBER)
>+   /* We do not support TLS 1.3.
>+      Setting empty TLS 1.3 ciphersuites disables them. */
>+   if (SSL_CTX_set_ciphersuites(ssl_ctx, "") == 0)
>
>Property changes on: databases/mysql57-client/files/patch-rapid_plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_xcom__ssl__transport.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: databases/mysql57-client/files/patch-vio_viosslfactories.c
>===================================================================
>--- databases/mysql57-client/files/patch-vio_viosslfactories.c	(nonexistent)
>+++ databases/mysql57-client/files/patch-vio_viosslfactories.c	(working copy)
>@@ -0,0 +1,11 @@
>+--- vio/viosslfactories.c.orig	2019-12-18 12:59:40 UTC
>++++ vio/viosslfactories.c
>+@@ -501,7 +501,7 @@ new_VioSSLFd(const char *key_file, const char *cert_fi
>+   struct st_VioSSLFd *ssl_fd;
>+   /* MySQL 5.7 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
>++#ifdef SSL_OP_NO_TLSv1_3
>+                         | SSL_OP_NO_TLSv1_3
>+ #endif /* HAVE_TLSv13 */
>+                         ;
>
>Property changes on: databases/mysql57-client/files/patch-vio_viosslfactories.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 244320: 211857