Skip to content

Commit

Permalink
fix SSL tests for the new C/C 3.4
Browse files Browse the repository at this point in the history
it no longer supports TLSv1.0
  • Loading branch information
vuvova committed Apr 22, 2024
1 parent ea6975b commit 594bd86
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 37 deletions.
10 changes: 10 additions & 0 deletions mysql-test/main/tls_version.result
@@ -1,15 +1,25 @@
#default is highest available version: TLSv1.2
Variable_name Value
Ssl_version TLSv1.2
# TLSv1.2
Variable_name Value
Ssl_version TLSv1.2
# TLSv1.1
Variable_name Value
Ssl_version TLSv1.1
# if a gap is between TLS versions, lowest version number should be used (TLS1.1)
Variable_name Value
Ssl_version TLSv1.1
# TLSv1.3 is not enabled, so TLSv1.2 should be used
Variable_name Value
Ssl_version TLSv1.2
# Highest TLS version number should be used (TLSv1.2)
Variable_name Value
Ssl_version TLSv1.2
# TLS v1.0 is no longer supported, an attempt to set it is ignored
Variable_name Value
Ssl_version TLSv1.2
# finally list available protocols
@@tls_version
TLSv1.1,TLSv1.2
call mtr.add_suppression("TLSv1.0 and TLSv1.1 are insecure");
Expand Down
19 changes: 8 additions & 11 deletions mysql-test/main/tls_version.test
Expand Up @@ -2,24 +2,21 @@
# with support for SSL.

-- source include/have_ssl_communication.inc
#default is highest available version: TLSv1.2
--echo #default is highest available version: TLSv1.2
--exec $MYSQL --host=localhost --ssl -e "show status like 'ssl_version';"
# TLSv1.2
--echo # TLSv1.2
--exec $MYSQL --host=localhost --ssl --tls_version=TLSv1.2 -e "show status like 'ssl_version';"
# TLSv1.1
--echo # TLSv1.1
--exec $MYSQL --host=localhost --ssl --tls_version=TLSv1.1 -e "show status like 'ssl_version';"
# if a gap is between TLS versions, lowest version number should be used (TLS1.1)
--echo # if a gap is between TLS versions, lowest version number should be used (TLS1.1)
--exec $MYSQL --host=localhost --ssl --tls_version=TLSv1.1,TLSv1.3 -e "show status like 'ssl_version';"
# TLSv1.3 is not enabled, so TLSv1.2 should be used
--echo # TLSv1.3 is not enabled, so TLSv1.2 should be used
--exec $MYSQL --host=localhost --ssl --tls_version=TLSv1.2,TLSv1.3 -e "show status like 'ssl_version';"
# Highest TLS version number should be used (TLSv1.2)
--echo # Highest TLS version number should be used (TLSv1.2)
--exec $MYSQL --host=localhost --ssl --tls_version=TLSv1.1,TLSv1.2 -e "show status like 'ssl_version';"
# Errors:
# TLS v1.0 is disabled on server, so we should get an error
--replace_regex /2026 SSL connection error.*/2026 SSL connection error: xxxx/
--error 1
--echo # TLS v1.0 is no longer supported, an attempt to set it is ignored
--exec $MYSQL --host=localhost --ssl --tls_version=TLSv1.0 -e "show status like 'ssl_version';"
# finally list available protocols
--echo # finally list available protocols
--exec $MYSQL --host=localhost --ssl -e "select @@tls_version;"

call mtr.add_suppression("TLSv1.0 and TLSv1.1 are insecure");
Expand Down
1 change: 0 additions & 1 deletion mysql-test/main/tls_version1.opt

This file was deleted.

8 changes: 0 additions & 8 deletions mysql-test/main/tls_version1.result

This file was deleted.

17 changes: 0 additions & 17 deletions mysql-test/main/tls_version1.test

This file was deleted.

0 comments on commit 594bd86

Please sign in to comment.