[packages/mysql/MYSQL_5_0] 2048 DH
arekm
arekm at pld-linux.org
Tue Oct 18 09:41:31 CEST 2022
commit ea606baa52e2f8ebc3de521377a70df42ff6bfb5
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Tue Oct 18 09:30:09 2022 +0200
2048 DH
community-mysql-dh.patch | 118 +++++++++++++++++++++++++++++++++++++++++++
community-mysql-dh1024.patch | 63 -----------------------
mysql.spec | 5 +-
openssl.patch | 8 +--
4 files changed, 125 insertions(+), 69 deletions(-)
---
diff --git a/mysql.spec b/mysql.spec
index 5c053cc..dd3f474 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -79,7 +79,7 @@ Patch23: big_tables_fixlp284123_fix%{name}35346.patch
Patch24: bison3.patch
Patch25: %{name}-sslchain.patch
Patch26: %{name}-yacc.patch
-Patch27: community-mysql-dh1024.patch
+Patch27: community-mysql-dh.patch
Patch28: openssl.patch
Patch29: mysqldump-compat.patch
# <percona patches, http://www.percona.com/percona-lab.html>
@@ -590,8 +590,9 @@ mv sphinx-*/mysqlse sql/sphinx
%{__sed} -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.in
%build
+:> config/ac-macros/alloca.m4
%{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I config/ac-macros
%{__automake}
%{__autoheader}
%{__autoconf}
diff --git a/community-mysql-dh.patch b/community-mysql-dh.patch
new file mode 100644
index 0000000..c9b394a
--- /dev/null
+++ b/community-mysql-dh.patch
@@ -0,0 +1,118 @@
+diff -ur mysql-5.0.96.org/include/violite.h mysql-5.0.96/include/violite.h
+--- mysql-5.0.96.org/include/violite.h 2012-03-02 15:04:08.000000000 +0100
++++ mysql-5.0.96/include/violite.h 2022-10-18 09:25:09.392730949 +0200
+@@ -116,7 +116,7 @@
+ {
+ SSL_INITERR_NOERROR= 0, SSL_INITERR_CERT, SSL_INITERR_KEY,
+ SSL_INITERR_NOMATCH, SSL_INITERR_BAD_PATHS, SSL_INITERR_CIPHERS,
+- SSL_INITERR_MEMFAIL, SSL_INITERR_LASTERR
++ SSL_INITERR_MEMFAIL, SSL_INITERR_DHFAIL, SSL_INITERR_LASTERR
+ };
+ const char* sslGetErrString(enum enum_ssl_init_error err);
+
+diff -ur mysql-5.0.96.org/vio/viosslfactories.c mysql-5.0.96/vio/viosslfactories.c
+--- mysql-5.0.96.org/vio/viosslfactories.c 2022-10-18 09:24:34.229397615 +0200
++++ mysql-5.0.96/vio/viosslfactories.c 2022-10-18 09:27:53.332730929 +0200
+@@ -24,27 +24,56 @@
+ static bool ssl_error_strings_loaded= FALSE;
+ static int verify_depth = 0;
+
+-static unsigned char dh512_p[]=
+-{
+- 0xDA,0x58,0x3C,0x16,0xD9,0x85,0x22,0x89,0xD0,0xE4,0xAF,0x75,
+- 0x6F,0x4C,0xCA,0x92,0xDD,0x4B,0xE5,0x33,0xB8,0x04,0xFB,0x0F,
+- 0xED,0x94,0xEF,0x9C,0x8A,0x44,0x03,0xED,0x57,0x46,0x50,0xD3,
+- 0x69,0x99,0xDB,0x29,0xD7,0x76,0x27,0x6B,0xA2,0xD3,0xD4,0x12,
+- 0xE2,0x18,0xF4,0xDD,0x1E,0x08,0x4C,0xF6,0xD8,0x00,0x3E,0x7C,
+- 0x47,0x74,0xE8,0x33,
+-};
++/*
++ Diffie-Hellman key.
++ Generated using: >openssl dhparam -5 -C 2048
++
++ -----BEGIN DH PARAMETERS-----
++ MIIBCAKCAQEAil36wGZ2TmH6ysA3V1xtP4MKofXx5n88xq/aiybmGnReZMviCPEJ
++ 46+7VCktl/RZ5iaDH1XNG1dVQmznt9pu2G3usU+k1/VB4bQL4ZgW4u0Wzxh9PyXD
++ glm99I9Xyj4Z5PVE4MyAsxCRGA1kWQpD9/zKAegUBPLNqSo886Uqg9hmn8ksyU9E
++ BV5eAEciCuawh6V0O+Sj/C3cSfLhgA0GcXp3OqlmcDu6jS5gWjn3LdP1U0duVxMB
++ h/neTSCSvtce4CAMYMjKNVh9P1nu+2d9ZH2Od2xhRIqMTfAS1KTqF3VmSWzPFCjG
++ mjxx/bg6bOOjpgZapvB6ABWlWmRmAAWFtwIBBQ==
++ -----END DH PARAMETERS-----
++ */
++static unsigned char dh2048_p[]=
++ {
++ 0x8A, 0x5D, 0xFA, 0xC0, 0x66, 0x76, 0x4E, 0x61, 0xFA, 0xCA, 0xC0, 0x37,
++ 0x57, 0x5C, 0x6D, 0x3F, 0x83, 0x0A, 0xA1, 0xF5, 0xF1, 0xE6, 0x7F, 0x3C,
++ 0xC6, 0xAF, 0xDA, 0x8B, 0x26, 0xE6, 0x1A, 0x74, 0x5E, 0x64, 0xCB, 0xE2,
++ 0x08, 0xF1, 0x09, 0xE3, 0xAF, 0xBB, 0x54, 0x29, 0x2D, 0x97, 0xF4, 0x59,
++ 0xE6, 0x26, 0x83, 0x1F, 0x55, 0xCD, 0x1B, 0x57, 0x55, 0x42, 0x6C, 0xE7,
++ 0xB7, 0xDA, 0x6E, 0xD8, 0x6D, 0xEE, 0xB1, 0x4F, 0xA4, 0xD7, 0xF5, 0x41,
++ 0xE1, 0xB4, 0x0B, 0xE1, 0x98, 0x16, 0xE2, 0xED, 0x16, 0xCF, 0x18, 0x7D,
++ 0x3F, 0x25, 0xC3, 0x82, 0x59, 0xBD, 0xF4, 0x8F, 0x57, 0xCA, 0x3E, 0x19,
++ 0xE4, 0xF5, 0x44, 0xE0, 0xCC, 0x80, 0xB3, 0x10, 0x91, 0x18, 0x0D, 0x64,
++ 0x59, 0x0A, 0x43, 0xF7, 0xFC, 0xCA, 0x01, 0xE8, 0x14, 0x04, 0xF2, 0xCD,
++ 0xA9, 0x2A, 0x3C, 0xF3, 0xA5, 0x2A, 0x83, 0xD8, 0x66, 0x9F, 0xC9, 0x2C,
++ 0xC9, 0x4F, 0x44, 0x05, 0x5E, 0x5E, 0x00, 0x47, 0x22, 0x0A, 0xE6, 0xB0,
++ 0x87, 0xA5, 0x74, 0x3B, 0xE4, 0xA3, 0xFC, 0x2D, 0xDC, 0x49, 0xF2, 0xE1,
++ 0x80, 0x0D, 0x06, 0x71, 0x7A, 0x77, 0x3A, 0xA9, 0x66, 0x70, 0x3B, 0xBA,
++ 0x8D, 0x2E, 0x60, 0x5A, 0x39, 0xF7, 0x2D, 0xD3, 0xF5, 0x53, 0x47, 0x6E,
++ 0x57, 0x13, 0x01, 0x87, 0xF9, 0xDE, 0x4D, 0x20, 0x92, 0xBE, 0xD7, 0x1E,
++ 0xE0, 0x20, 0x0C, 0x60, 0xC8, 0xCA, 0x35, 0x58, 0x7D, 0x3F, 0x59, 0xEE,
++ 0xFB, 0x67, 0x7D, 0x64, 0x7D, 0x8E, 0x77, 0x6C, 0x61, 0x44, 0x8A, 0x8C,
++ 0x4D, 0xF0, 0x12, 0xD4, 0xA4, 0xEA, 0x17, 0x75, 0x66, 0x49, 0x6C, 0xCF,
++ 0x14, 0x28, 0xC6, 0x9A, 0x3C, 0x71, 0xFD, 0xB8, 0x3A, 0x6C, 0xE3, 0xA3,
++ 0xA6, 0x06, 0x5A, 0xA6, 0xF0, 0x7A, 0x00, 0x15, 0xA5, 0x5A, 0x64, 0x66,
++ 0x00, 0x05, 0x85, 0xB7,
++ };
++
++static unsigned char dh2048_g[]={
++ 0x05,
++ };
+
+-static unsigned char dh512_g[]={
+- 0x02,
+-};
+-
+-static DH *get_dh512(void)
++static DH *get_dh2048(void)
+ {
+ DH *dh;
+ if ((dh=DH_new()))
+ {
+- dh->p=BN_bin2bn(dh512_p,sizeof(dh512_p),NULL);
+- dh->g=BN_bin2bn(dh512_g,sizeof(dh512_g),NULL);
++ dh->p=BN_bin2bn(dh2048_p,sizeof(dh2048_p),NULL);
++ dh->g=BN_bin2bn(dh2048_g,sizeof(dh2048_g),NULL);
+ if (! dh->p || ! dh->g)
+ {
+ DH_free(dh);
+@@ -85,7 +114,8 @@
+ "Private key does not match the certificate public key"
+ "SSL_CTX_set_default_verify_paths failed",
+ "Failed to set ciphers to use",
+- "SSL_CTX_new failed"
++ "SSL_CTX_new failed",
++ "SSL_CTX_set_tmp_dh failed"
+ };
+
+ const char*
+@@ -265,8 +295,17 @@
+ }
+
+ /* DH stuff */
+- dh=get_dh512();
+- SSL_CTX_set_tmp_dh(ssl_fd->ssl_context, dh);
++ dh= get_dh2048();
++ if (SSL_CTX_set_tmp_dh(ssl_fd->ssl_context, dh) == 0)
++ {
++ *error= SSL_INITERR_DHFAIL;
++ DBUG_PRINT("error", ("%s", sslGetErrString(*error)));
++ report_errors();
++ DH_free(dh);
++ SSL_CTX_free(ssl_fd->ssl_context);
++ my_free(ssl_fd);
++ DBUG_RETURN(0);
++ }
+ DH_free(dh);
+
+ DBUG_PRINT("exit", ("OK 1"));
diff --git a/community-mysql-dh1024.patch b/community-mysql-dh1024.patch
deleted file mode 100644
index 815d74a..0000000
--- a/community-mysql-dh1024.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Change the DH key length from 512 to 1024 bits to meet minimum requirements
-of FIPS 140-2. (In principle we could use the larger size only when FIPS
-mode is on, but it doesn't seem worth the trouble.)
-
-The new parameter value was generated using "openssl dhparam -C 1024".
-
-
-diff -urNp -x '*.orig' mysql-5.0.96.org/vio/viosslfactories.c mysql-5.0.96/vio/viosslfactories.c
---- mysql-5.0.96.org/vio/viosslfactories.c 2022-10-18 08:35:47.736064643 +0200
-+++ mysql-5.0.96/vio/viosslfactories.c 2022-10-18 08:35:48.949397977 +0200
-@@ -24,27 +24,32 @@ static bool ssl_algorithms_added
- static bool ssl_error_strings_loaded= FALSE;
- static int verify_depth = 0;
-
--static unsigned char dh512_p[]=
-+static unsigned char dh1024_p[]=
- {
-- 0xDA,0x58,0x3C,0x16,0xD9,0x85,0x22,0x89,0xD0,0xE4,0xAF,0x75,
-- 0x6F,0x4C,0xCA,0x92,0xDD,0x4B,0xE5,0x33,0xB8,0x04,0xFB,0x0F,
-- 0xED,0x94,0xEF,0x9C,0x8A,0x44,0x03,0xED,0x57,0x46,0x50,0xD3,
-- 0x69,0x99,0xDB,0x29,0xD7,0x76,0x27,0x6B,0xA2,0xD3,0xD4,0x12,
-- 0xE2,0x18,0xF4,0xDD,0x1E,0x08,0x4C,0xF6,0xD8,0x00,0x3E,0x7C,
-- 0x47,0x74,0xE8,0x33,
-+ 0xBF,0x5C,0xFA,0xD1,0xDD,0xBB,0xB3,0x0A,0x58,0x29,0x05,0xF5,
-+ 0x7D,0x64,0xB2,0xE1,0xCE,0xE8,0xE0,0xE1,0x7A,0xB6,0xBC,0x5B,
-+ 0x21,0x56,0xDF,0x2C,0x82,0x60,0xDC,0x31,0xCA,0x1E,0x02,0xFE,
-+ 0xC4,0xE7,0x24,0x63,0x31,0xE4,0x67,0x1C,0x0B,0xFF,0x86,0x12,
-+ 0x0D,0x2E,0xE6,0x35,0x0A,0x07,0x4F,0xE7,0x3F,0xDE,0xFE,0xF0,
-+ 0x13,0x1C,0xA2,0x2B,0xF4,0xEE,0x2C,0x90,0x10,0x57,0x6B,0x2B,
-+ 0xB9,0x1E,0x1B,0x47,0xB0,0x25,0xBF,0x45,0x86,0xDA,0x87,0x35,
-+ 0x2C,0xF5,0x6A,0x41,0xA2,0x57,0xD8,0x16,0x5E,0x82,0x91,0x99,
-+ 0x33,0xA0,0x8B,0x9D,0x34,0xCE,0x03,0x01,0x80,0x32,0x07,0x3B,
-+ 0xF2,0x93,0xFC,0x3A,0x25,0xEC,0xB3,0xED,0x5C,0x4E,0x57,0xF2,
-+ 0x3C,0x2E,0x0D,0xB1,0x59,0xA2,0x08,0x93,
- };
-
--static unsigned char dh512_g[]={
-+static unsigned char dh1024_g[]={
- 0x02,
- };
-
--static DH *get_dh512(void)
-+static DH *get_dh1024(void)
- {
- DH *dh;
- if ((dh=DH_new()))
- {
-- dh->p=BN_bin2bn(dh512_p,sizeof(dh512_p),NULL);
-- dh->g=BN_bin2bn(dh512_g,sizeof(dh512_g),NULL);
-+ dh->p=BN_bin2bn(dh1024_p,sizeof(dh1024_p),NULL);
-+ dh->g=BN_bin2bn(dh1024_g,sizeof(dh1024_g),NULL);
- if (! dh->p || ! dh->g)
- {
- DH_free(dh);
-@@ -265,7 +270,7 @@ new_VioSSLFd(const char *key_file, const
- }
-
- /* DH stuff */
-- dh=get_dh512();
-+ dh=get_dh1024();
- SSL_CTX_set_tmp_dh(ssl_fd->ssl_context, dh);
- DH_free(dh);
-
diff --git a/openssl.patch b/openssl.patch
index 20f88b6..a8a426e 100644
--- a/openssl.patch
+++ b/openssl.patch
@@ -4,10 +4,10 @@
DH *dh;
if ((dh=DH_new()))
{
-- dh->p=BN_bin2bn(dh1024_p,sizeof(dh1024_p),NULL);
-- dh->g=BN_bin2bn(dh1024_g,sizeof(dh1024_g),NULL);
-+ BIGNUM* p= BN_bin2bn(dh1024_p,sizeof(dh1024_p),NULL);
-+ BIGNUM* g= BN_bin2bn(dh1024_g,sizeof(dh1024_g),NULL);
+- dh->p=BN_bin2bn(dh2048_p,sizeof(dh2048_p),NULL);
+- dh->g=BN_bin2bn(dh2048_g,sizeof(dh2048_g),NULL);
++ BIGNUM* p= BN_bin2bn(dh2048_p,sizeof(dh2048_p),NULL);
++ BIGNUM* g= BN_bin2bn(dh2048_g,sizeof(dh2048_g),NULL);
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ dh->p= p;
+ dh->g= g;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mysql.git/commitdiff/f7e00a11be02fbb7da288ad58e90ebfe28f1134d
More information about the pld-cvs-commit
mailing list