ganapathi / rpms / mariadb

Forked from rpms/mariadb 4 years ago
Clone
4b7078
Don't test EDH-RSA-DES-CBC-SHA cipher, it seems to be removed from openssl
4b7078
which now makes mariadb/mysql FTBFS because openssl_1 test fails
4b7078
4b7078
Related: #1044565
4b7078
4b7078
4b7078
diff -up mariadb-10.0.15/mysql-test/r/openssl_1.result.orig mariadb-10.0.15/mysql-test/r/openssl_1.result
4b7078
--- mariadb-10.0.15/mysql-test/r/openssl_1.result.orig	2014-11-27 15:25:32.582771542 +0100
4b7078
+++ mariadb-10.0.15/mysql-test/r/openssl_1.result	2014-11-27 15:22:46.353474672 +0100
4b7078
@@ -198,8 +198,6 @@ Ssl_cipher	DHE-RSA-AES256-SHA
4b7078
 Variable_name	Value
4b7078
 Ssl_cipher	EDH-RSA-DES-CBC3-SHA
4b7078
 Variable_name	Value
4b7078
-Ssl_cipher	EDH-RSA-DES-CBC-SHA
4b7078
-Variable_name	Value
4b7078
 Ssl_cipher	RC4-SHA
4b7078
 select 'is still running; no cipher request crashed the server' as result from dual;
4b7078
 result
4b7078
diff -up mariadb-10.0.15/mysql-test/t/openssl_1.test.orig mariadb-10.0.15/mysql-test/t/openssl_1.test
4b7078
--- mariadb-10.0.15/mysql-test/t/openssl_1.test.orig	2014-11-27 15:25:16.637743066 +0100
4b7078
+++ mariadb-10.0.15/mysql-test/t/openssl_1.test	2014-11-27 15:22:46.354474674 +0100
4b7078
@@ -222,7 +222,7 @@ DROP TABLE t1;
4b7078
 # Common ciphers to openssl and yassl
4b7078
 --exec $MYSQL --host=localhost -e "SHOW STATUS LIKE 'Ssl_cipher';" --ssl-cipher=DHE-RSA-AES256-SHA
4b7078
 --exec $MYSQL --host=localhost -e "SHOW STATUS LIKE 'Ssl_cipher';" --ssl-cipher=EDH-RSA-DES-CBC3-SHA
4b7078
---exec $MYSQL --host=localhost -e "SHOW STATUS LIKE 'Ssl_cipher';" --ssl-cipher=EDH-RSA-DES-CBC-SHA
4b7078
+#--exec $MYSQL --host=localhost -e "SHOW STATUS LIKE 'Ssl_cipher';" --ssl-cipher=EDH-RSA-DES-CBC-SHA
4b7078
 --exec $MYSQL --host=localhost -e "SHOW STATUS LIKE 'Ssl_cipher';" --ssl-cipher=RC4-SHA
4b7078
 --disable_query_log
4b7078
 --disable_result_log