Skip to content

Commit 594bd86

Browse files
committed
fix SSL tests for the new C/C 3.4
it no longer supports TLSv1.0
1 parent ea6975b commit 594bd86

File tree

5 files changed

+18
-37
lines changed

5 files changed

+18
-37
lines changed

mysql-test/main/tls_version.result

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,25 @@
1+
#default is highest available version: TLSv1.2
12
Variable_name Value
23
Ssl_version TLSv1.2
4+
# TLSv1.2
35
Variable_name Value
46
Ssl_version TLSv1.2
7+
# TLSv1.1
58
Variable_name Value
69
Ssl_version TLSv1.1
10+
# if a gap is between TLS versions, lowest version number should be used (TLS1.1)
711
Variable_name Value
812
Ssl_version TLSv1.1
13+
# TLSv1.3 is not enabled, so TLSv1.2 should be used
914
Variable_name Value
1015
Ssl_version TLSv1.2
16+
# Highest TLS version number should be used (TLSv1.2)
1117
Variable_name Value
1218
Ssl_version TLSv1.2
19+
# TLS v1.0 is no longer supported, an attempt to set it is ignored
20+
Variable_name Value
21+
Ssl_version TLSv1.2
22+
# finally list available protocols
1323
@@tls_version
1424
TLSv1.1,TLSv1.2
1525
call mtr.add_suppression("TLSv1.0 and TLSv1.1 are insecure");

mysql-test/main/tls_version.test

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,21 @@
22
# with support for SSL.
33

44
-- source include/have_ssl_communication.inc
5-
#default is highest available version: TLSv1.2
5+
--echo #default is highest available version: TLSv1.2
66
--exec $MYSQL --host=localhost --ssl -e "show status like 'ssl_version';"
7-
# TLSv1.2
7+
--echo # TLSv1.2
88
--exec $MYSQL --host=localhost --ssl --tls_version=TLSv1.2 -e "show status like 'ssl_version';"
9-
# TLSv1.1
9+
--echo # TLSv1.1
1010
--exec $MYSQL --host=localhost --ssl --tls_version=TLSv1.1 -e "show status like 'ssl_version';"
11-
# if a gap is between TLS versions, lowest version number should be used (TLS1.1)
11+
--echo # if a gap is between TLS versions, lowest version number should be used (TLS1.1)
1212
--exec $MYSQL --host=localhost --ssl --tls_version=TLSv1.1,TLSv1.3 -e "show status like 'ssl_version';"
13-
# TLSv1.3 is not enabled, so TLSv1.2 should be used
13+
--echo # TLSv1.3 is not enabled, so TLSv1.2 should be used
1414
--exec $MYSQL --host=localhost --ssl --tls_version=TLSv1.2,TLSv1.3 -e "show status like 'ssl_version';"
15-
# Highest TLS version number should be used (TLSv1.2)
15+
--echo # Highest TLS version number should be used (TLSv1.2)
1616
--exec $MYSQL --host=localhost --ssl --tls_version=TLSv1.1,TLSv1.2 -e "show status like 'ssl_version';"
17-
# Errors:
18-
# TLS v1.0 is disabled on server, so we should get an error
19-
--replace_regex /2026 SSL connection error.*/2026 SSL connection error: xxxx/
20-
--error 1
17+
--echo # TLS v1.0 is no longer supported, an attempt to set it is ignored
2118
--exec $MYSQL --host=localhost --ssl --tls_version=TLSv1.0 -e "show status like 'ssl_version';"
22-
# finally list available protocols
19+
--echo # finally list available protocols
2320
--exec $MYSQL --host=localhost --ssl -e "select @@tls_version;"
2421

2522
call mtr.add_suppression("TLSv1.0 and TLSv1.1 are insecure");

mysql-test/main/tls_version1.opt

Lines changed: 0 additions & 1 deletion
This file was deleted.

mysql-test/main/tls_version1.result

Lines changed: 0 additions & 8 deletions
This file was deleted.

mysql-test/main/tls_version1.test

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)