X-Git-Url: https://git.tld-linux.org/?p=packages%2Fmysql.git;a=blobdiff_plain;f=mysql-chain-certs.patch;h=0a99238330c357d28d002a79907a68b60a557d1c;hp=3914311ba2c0891d206de00e9ca2507c003e8902;hb=560cbe9cf273873ce4f7a78e10585c72682fc477;hpb=a493b021b29c483c5c23a81f1b5192bff3f0d55f

diff --git a/mysql-chain-certs.patch b/mysql-chain-certs.patch
index 3914311..0a99238 100644
--- a/mysql-chain-certs.patch
+++ b/mysql-chain-certs.patch
@@ -1,19 +1,7 @@
-Fix things so that chains of certificates work in the server and client
-certificate files.
-
-This only really works for OpenSSL-based builds, as yassl is unable to read
-multiple certificates from a file.  The patch below to yassl/src/ssl.cpp
-doesn't fix that, but just arranges that the viosslfactories.c patch won't
-have any ill effects in a yassl build.  Since we don't use yassl in Red Hat/
-Fedora builds, I'm not feeling motivated to try to fix yassl for this.
-
-See RH bug #598656.  Filed upstream at http://bugs.mysql.com/bug.php?id=54158
-
-
-diff -Naur mysql-5.1.47.orig/vio/viosslfactories.c mysql-5.1.47/vio/viosslfactories.c
---- mysql-5.1.47.orig/vio/viosslfactories.c	2010-05-06 11:28:07.000000000 -0400
-+++ mysql-5.1.47/vio/viosslfactories.c	2010-05-26 23:23:46.000000000 -0400
-@@ -106,7 +106,7 @@
+diff -ur percona-server-5.7.28-31.orig/vio/viosslfactories.c percona-server-5.7.28-31/vio/viosslfactories.c
+--- percona-server-5.7.28-31.orig/vio/viosslfactories.c	2019-12-16 23:44:00.665000000 +0100
++++ percona-server-5.7.28-31/vio/viosslfactories.c	2019-12-16 23:46:07.804000000 +0100
+@@ -199,7 +199,7 @@
      key_file= cert_file;
  
    if (cert_file &&
@@ -22,20 +10,3 @@ diff -Naur mysql-5.1.47.orig/vio/viosslfactories.c mysql-5.1.47/vio/viosslfactor
    {
      *error= SSL_INITERR_CERT;
      DBUG_PRINT("error",("%s from file '%s'", sslGetErrString(*error), cert_file));
-diff -Naur mysql-5.1.47.orig/extra/yassl/src/ssl.cpp mysql-5.1.47/extra/yassl/src/ssl.cpp
---- mysql-5.1.47.orig/extra/yassl/src/ssl.cpp	2010-05-06 11:24:26.000000000 -0400
-+++ mysql-5.1.47/extra/yassl/src/ssl.cpp	2010-05-26 23:29:13.000000000 -0400
-@@ -1606,10 +1606,10 @@
-     }
- 
- 
--    int SSL_CTX_use_certificate_chain_file(SSL_CTX*, const char*)
-+    int SSL_CTX_use_certificate_chain_file(SSL_CTX* ctx, const char* file)
-     {
--        // TDOD:
--        return SSL_SUCCESS;
-+        // For the moment, treat like use_certificate_file
-+        return read_file(ctx, file, SSL_FILETYPE_PEM, Cert);
-     }
- 
-