From cb8f837a3d0d16bdbfc9c545d32527ad28b0d841 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Tue, 18 Nov 2014 17:57:06 +0100 Subject: MDEV-6975 Implement TLS protocol change SSL methods to be SSLv23 (according to openssl manpage: "A TLS/SSL connection established with these methods may understand the SSLv2, SSLv3, TLSv1, TLSv1.1 and TLSv1.2 protocols") from TLSv1 methods, that go back to the initial SSL implementation in MySQL in 2001. OpenSSL default ciphers are different if TLSv1.2 is enabled, so tests need to take this into account. --- mysql-test/t/ssl.test | 2 ++ 1 file changed, 2 insertions(+) (limited to 'mysql-test/t/ssl.test') diff --git a/mysql-test/t/ssl.test b/mysql-test/t/ssl.test index 341ec0591e7..d6f88fe888e 100644 --- a/mysql-test/t/ssl.test +++ b/mysql-test/t/ssl.test @@ -11,12 +11,14 @@ connect (ssl_con,localhost,root,,,,,SSL); # Check ssl turned on +--replace_result DHE-RSA-AES256-GCM-SHA384 DHE-RSA-AES256-SHA SHOW STATUS LIKE 'Ssl_cipher'; # Source select test case -- source include/common-tests.inc # Check ssl turned on +--replace_result DHE-RSA-AES256-GCM-SHA384 DHE-RSA-AES256-SHA SHOW STATUS LIKE 'Ssl_cipher'; connection default; -- cgit v1.2.1