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