21 lines
1.2 KiB
Diff
21 lines
1.2 KiB
Diff
|
--- mariadb-10.1.15/mysql-test/t/openssl_1.test.orig 2016-06-29 22:56:09.000000000 +0200
|
||
|
|
+++ mariadb-10.1.15/mysql-test/t/openssl_1.test 2016-07-04 10:47:13.366522457 +0200
|
||
|
|
@@ -134,7 +134,7 @@ drop table t1;
|
||
|
|
# verification of servers certificate by setting both ca certificate
|
||
|
|
# and ca path to NULL
|
||
|
|
#
|
||
|
|
---replace_result DHE-RSA-AES256-GCM-SHA384 DHE-RSA-AES256-SHA DHE-RSA-CHACHA20-POLY1305 DHE-RSA-AES256-SHA
|
||
|
|
+--replace_result DHE-RSA-AES256-GCM-SHA384 DHE-RSA-AES256-SHA DHE-RSA-CHACHA20-POLY1305 DHE-RSA-AES256-SHA AES256-GCM-SHA384 DHE-RSA-AES256-SHA
|
||
|
|
--exec $MYSQL --ssl --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1
|
||
|
|
--echo End of 5.0 tests
|
||
|
|
|
||
|
|
@@ -259,7 +259,7 @@ select 'is still running; no cipher requ
|
||
|
|
GRANT SELECT ON test.* TO bug42158@localhost REQUIRE X509;
|
||
|
|
FLUSH PRIVILEGES;
|
||
|
|
connect(con1,localhost,bug42158,,,,,SSL);
|
||
|
|
---replace_result DHE-RSA-AES256-GCM-SHA384 DHE-RSA-AES256-SHA DHE-RSA-CHACHA20-POLY1305 DHE-RSA-AES256-SHA
|
||
|
|
+--replace_result DHE-RSA-AES256-GCM-SHA384 DHE-RSA-AES256-SHA DHE-RSA-CHACHA20-POLY1305 DHE-RSA-AES256-SHA AES256-GCM-SHA384 DHE-RSA-AES256-SHA
|
||
|
|
SHOW STATUS LIKE 'Ssl_cipher';
|
||
|
|
disconnect con1;
|
||
|
|
connection default;
|