summaryrefslogtreecommitdiff
path: root/mysql-test/t/ssl_compress.test
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2014-11-18 17:57:06 +0100
committerSergei Golubchik <sergii@pisem.net>2014-11-18 17:57:06 +0100
commitcb8f837a3d0d16bdbfc9c545d32527ad28b0d841 (patch)
tree30fd5447e10cd587a0ff68c6e083c943f61b1e7b /mysql-test/t/ssl_compress.test
parent386e2e52f63971d3c1f33fb6b90715549d81ed1e (diff)
downloadmariadb-git-cb8f837a3d0d16bdbfc9c545d32527ad28b0d841.tar.gz
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.
Diffstat (limited to 'mysql-test/t/ssl_compress.test')
-rw-r--r--mysql-test/t/ssl_compress.test2
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/t/ssl_compress.test b/mysql-test/t/ssl_compress.test
index 8e0dea53fe7..5e45e3824a2 100644
--- a/mysql-test/t/ssl_compress.test
+++ b/mysql-test/t/ssl_compress.test
@@ -11,6 +11,7 @@
connect (ssl_compress_con,localhost,root,,,,,SSL COMPRESS);
# Check ssl turned on
+--replace_result DHE-RSA-AES256-GCM-SHA384 DHE-RSA-AES256-SHA
SHOW STATUS LIKE 'Ssl_cipher';
# Check compression turned on
@@ -20,6 +21,7 @@ SHOW STATUS LIKE 'Compression';
-- 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';
# Check compression turned on