Hello community,
here is the log from the commit of package mysql-community-server for
openSUSE:Factory checked in at 2015-07-02 22:49:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mysql-community-server (Old)
and /work/SRC/openSUSE:Factory/.mysql-community-server.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mysql-community-server"
Changes:
--------
---
/work/SRC/openSUSE:Factory/mysql-community-server/mysql-community-server.changes
2015-06-30 10:16:40.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.mysql-community-server.new/mysql-community-server.changes
2015-07-03 00:10:33.000000000 +0200
@@ -1,0 +2,6 @@
+Tue Jun 30 11:12:41 UTC 2015 - [email protected]
+
+- Add patch to fix bnc#934789 Logjam Attack: mysql uses 512 bit dh
+ groups in SSL
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mysql-community-server.spec ++++++
--- /var/tmp/diff_new_pack.YpGUtC/_old 2015-07-03 00:10:35.000000000 +0200
+++ /var/tmp/diff_new_pack.YpGUtC/_new 2015-07-03 00:10:35.000000000 +0200
@@ -469,7 +469,7 @@
mv %{buildroot}%{_datadir}/mysql-test/lib/My/SafeProcess/my_safe_process
%{buildroot}%{_bindir}
# Generate various filelists
-filelist innochecksum my_print_defaults myisam_ftdump myisamchk myisamlog
myisampack mysql_fix_extensions mysql_fix_privilege_tables mysql_install_db
mysql_secure_installation mysql_upgrade mysqlbug mysqld mysqld_multi
mysqld_safe mysqlbinlog mysqldumpslow mysqlmanager mroonga resolve_stack_dump
resolveip {m,}aria_chk {m,}aria_dump_log {m,}aria_ftdump {m,}aria_pack
{m,}aria_read_log xtstat tokuft_logprint tokuftdump >mysql.files
+filelist innochecksum my_print_defaults myisam_ftdump myisamchk myisamlog
myisampack mysql_fix_extensions mysql_fix_privilege_tables mysql_ssl_rsa_setup
mysql_install_db mysql_secure_installation mysql_upgrade mysqlbug mysqld
mysqld_multi mysqld_safe mysqlbinlog mysqldumpslow mysqlmanager mroonga
resolve_stack_dump resolveip {m,}aria_chk {m,}aria_dump_log {m,}aria_ftdump
{m,}aria_pack {m,}aria_read_log xtstat tokuft_logprint tokuftdump >mysql.files
filelist mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow
mysql_config_editor >mysql-client.files
# The dialog stuff is mariadb only
++++++ _constraints ++++++
--- /var/tmp/diff_new_pack.YpGUtC/_old 2015-07-03 00:10:35.000000000 +0200
+++ /var/tmp/diff_new_pack.YpGUtC/_new 2015-07-03 00:10:35.000000000 +0200
@@ -1,5 +1,8 @@
<constraints>
<hardware>
+ <physicalmemory>
+ <size unit="M">5000</size>
+ </physicalmemory>
<disk>
<size unit="G">13</size>
</disk>
++++++ configuration-tweaks.tar.bz2 ++++++
++++++ mysql-patches.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mysql-patches/mysql-patches/mysql-5.6.25-logjam.patch
new/mysql-patches/mysql-patches/mysql-5.6.25-logjam.patch
--- old/mysql-patches/mysql-patches/mysql-5.6.25-logjam.patch 1970-01-01
01:00:00.000000000 +0100
+++ new/mysql-patches/mysql-patches/mysql-5.6.25-logjam.patch 2015-06-30
11:06:34.000000000 +0200
@@ -0,0 +1,132 @@
+PATCH-P1-FIX-UPSTREAM: Logjam patch for mysql bnc#934789
+
+From 866b988a76e8e7e217017a7883a52a12ec5024b9 Mon Sep 17 00:00:00 2001
+From: Marek Szymczak <[email protected]>
+Date: Thu, 9 Oct 2014 16:39:43 +0200
+Subject: [PATCH] Bug#18367167 DH KEY LENGTH OF 1024 BITS TO MEET MINIMUM REQ
+ OF FIPS 140-2
+
+Perfect Forward Secrecy (PFS) requires Diffie-Hellman (DH) parameters to be
set. Current implementation uses DH key of 512 bit.
+---
+ include/violite.h | 3 ++-
+ vio/viosslfactories.c | 70 ++++++++++++++++++++++++++++++++++++++++-----------
+ 2 files changed, 57 insertions(+), 16 deletions(-)
+
+Index: mysql-5.6.25/include/violite.h
+===================================================================
+--- mysql-5.6.25.orig/include/violite.h
++++ mysql-5.6.25/include/violite.h
+@@ -147,7 +147,8 @@ enum enum_ssl_init_error
+ {
+ 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_NO_USABLE_CTX, SSL_INITERR_DHFAIL,
++ SSL_INITERR_LASTERR
+ };
+ const char* sslGetErrString(enum enum_ssl_init_error err);
+
+Index: mysql-5.6.25/vio/viosslfactories.c
+===================================================================
+--- mysql-5.6.25.orig/vio/viosslfactories.c
++++ mysql-5.6.25/vio/viosslfactories.c
+@@ -20,27 +20,56 @@
+ static my_bool ssl_algorithms_added = FALSE;
+ static my_bool ssl_error_strings_loaded= FALSE;
+
+-static unsigned char dh512_p[]=
++/*
++ 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[]=
+ {
+- 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,
++ 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 dh512_g[]={
+- 0x02,
++static unsigned char dh2048_g[]={
++ 0x05,
+ };
+
+-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);
+@@ -81,7 +110,9 @@ ssl_error_string[] =
+ "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 context is not usable without certificate and private key",
++ "SSL_CTX_set_tmp_dh failed"
+ };
+
+ const char*
+@@ -285,8 +316,17 @@ new_VioSSLFd(const char *key_file, const
+ }
+
+ /* 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"));
++++++ series ++++++
--- /var/tmp/diff_new_pack.YpGUtC/_old 2015-07-03 00:10:35.000000000 +0200
+++ /var/tmp/diff_new_pack.YpGUtC/_new 2015-07-03 00:10:35.000000000 +0200
@@ -12,3 +12,4 @@
mysql-community-server-5.6.12-logrotate-su.patch
mysql-community-server-5.6.24-regex_heap_overflow.patch
mysql-community-server-5.6.24-static_library.patch
+mysql-5.6.25-logjam.patch
