ganapathi / rpms / mariadb

Forked from rpms/mariadb 4 years ago
Clone

Blame SOURCES/mariadb-ssltest.patch

0012fd
Don't test EDH-RSA-DES-CBC-SHA cipher, it seems to be removed from openssl
0012fd
which now makes mariadb/mysql FTBFS because openssl_1 test fails
0012fd
0012fd
Related: #1044565
0012fd
0012fd
0012fd
diff -up mariadb-5.5.34/mysql-test/r/openssl_1.result.p20 mariadb-5.5.34/mysql-test/r/openssl_1.result
0012fd
--- mariadb-5.5.34/mysql-test/r/openssl_1.result.p20	2014-01-06 11:51:18.878640731 +0100
0012fd
+++ mariadb-5.5.34/mysql-test/r/openssl_1.result	2014-01-06 11:51:45.364678942 +0100
0012fd
@@ -196,8 +196,6 @@ Ssl_cipher	DHE-RSA-AES256-SHA
0012fd
 Variable_name	Value
0012fd
 Ssl_cipher	EDH-RSA-DES-CBC3-SHA
0012fd
 Variable_name	Value
0012fd
-Ssl_cipher	EDH-RSA-DES-CBC-SHA
0012fd
-Variable_name	Value
0012fd
 Ssl_cipher	RC4-SHA
0012fd
 select 'is still running; no cipher request crashed the server' as result from dual;
0012fd
 result
0012fd
diff -up mariadb-5.5.34/mysql-test/t/openssl_1.test.p20 mariadb-5.5.34/mysql-test/t/openssl_1.test
0012fd
--- mariadb-5.5.34/mysql-test/t/openssl_1.test.p20	2014-01-06 11:51:18.830640662 +0100
0012fd
+++ mariadb-5.5.34/mysql-test/t/openssl_1.test	2014-01-06 11:51:18.879640733 +0100
0012fd
@@ -218,7 +218,7 @@ DROP TABLE t1;
0012fd
 # Common ciphers to openssl and yassl
0012fd
 --exec $MYSQL --host=localhost -e "SHOW STATUS LIKE 'Ssl_cipher';" --ssl-cipher=DHE-RSA-AES256-SHA
0012fd
 --exec $MYSQL --host=localhost -e "SHOW STATUS LIKE 'Ssl_cipher';" --ssl-cipher=EDH-RSA-DES-CBC3-SHA
0012fd
---exec $MYSQL --host=localhost -e "SHOW STATUS LIKE 'Ssl_cipher';" --ssl-cipher=EDH-RSA-DES-CBC-SHA
0012fd
+#--exec $MYSQL --host=localhost -e "SHOW STATUS LIKE 'Ssl_cipher';" --ssl-cipher=EDH-RSA-DES-CBC-SHA
0012fd
 --exec $MYSQL --host=localhost -e "SHOW STATUS LIKE 'Ssl_cipher';" --ssl-cipher=RC4-SHA
0012fd
 --disable_query_log
0012fd
 --disable_result_log