de206ed
Don't test EDH-RSA-DES-CBC-SHA cipher, it seems to be removed from openssl
de206ed
which now makes mariadb/mysql FTBFS because openssl_1 test fails
de206ed
de206ed
Related: #1044565
de206ed
de206ed
Jakub Dorňák 6aba9be
diff -up mariadb-10.0.10/mysql-test/r/openssl_1.result.p14 mariadb-10.0.10/mysql-test/r/openssl_1.result
Jakub Dorňák 6aba9be
--- mariadb-10.0.10/mysql-test/r/openssl_1.result.p14	2014-03-30 19:56:35.000000000 +0200
Jakub Dorňák 6aba9be
+++ mariadb-10.0.10/mysql-test/r/openssl_1.result	2014-04-07 20:14:24.702980342 +0200
de206ed
@@ -196,8 +196,6 @@ Ssl_cipher	DHE-RSA-AES256-SHA
de206ed
 Variable_name	Value
de206ed
 Ssl_cipher	EDH-RSA-DES-CBC3-SHA
de206ed
 Variable_name	Value
de206ed
-Ssl_cipher	EDH-RSA-DES-CBC-SHA
de206ed
-Variable_name	Value
de206ed
 Ssl_cipher	RC4-SHA
de206ed
 select 'is still running; no cipher request crashed the server' as result from dual;
de206ed
 result
Jakub Dorňák 6aba9be
diff -up mariadb-10.0.10/mysql-test/t/openssl_1.test.p14 mariadb-10.0.10/mysql-test/t/openssl_1.test
Jakub Dorňák 6aba9be
--- mariadb-10.0.10/mysql-test/t/openssl_1.test.p14	2014-04-07 20:14:24.686980712 +0200
Jakub Dorňák 6aba9be
+++ mariadb-10.0.10/mysql-test/t/openssl_1.test	2014-04-07 20:14:24.702980342 +0200
de206ed
@@ -218,7 +218,7 @@ DROP TABLE t1;
de206ed
 # Common ciphers to openssl and yassl
de206ed
 --exec $MYSQL --host=localhost -e "SHOW STATUS LIKE 'Ssl_cipher';" --ssl-cipher=DHE-RSA-AES256-SHA
de206ed
 --exec $MYSQL --host=localhost -e "SHOW STATUS LIKE 'Ssl_cipher';" --ssl-cipher=EDH-RSA-DES-CBC3-SHA
de206ed
---exec $MYSQL --host=localhost -e "SHOW STATUS LIKE 'Ssl_cipher';" --ssl-cipher=EDH-RSA-DES-CBC-SHA
de206ed
+#--exec $MYSQL --host=localhost -e "SHOW STATUS LIKE 'Ssl_cipher';" --ssl-cipher=EDH-RSA-DES-CBC-SHA
de206ed
 --exec $MYSQL --host=localhost -e "SHOW STATUS LIKE 'Ssl_cipher';" --ssl-cipher=RC4-SHA
de206ed
 --disable_query_log
de206ed
 --disable_result_log