Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

MDEV-33863: New mysqladmin command tls-info #3247

Open
wants to merge 7 commits into
base: 11.4
Choose a base branch
from
Open

MDEV-33863: New mysqladmin command tls-info #3247

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c05610b
Use C/C branch 3.4-georg
9EOR9 Feb 20, 2024
5d028ad
test fixes:
9EOR9 Feb 21, 2024
e6cb2e1
MDEV-33863: New mysqladmin command tls-info
9EOR9 Apr 29, 2024
33ee3df
Use C/C branch 3.4-georg
9EOR9 Feb 20, 2024
f0db8a5
test fixes:
9EOR9 Feb 21, 2024
8e6da8b
MDEV-33863: New mysqladmin command tls-info
9EOR9 Apr 29, 2024
3feed05
Merge branch 'bb-11.4-georg' of https://github.com/mariadb/server int…
9EOR9 May 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Prev Previous commit
Next Next commit
test fixes: 
Since TLSv1.0 is no longer supported in C/C 3.4, TLS1.0 tests which
were expected to fail are removed.
  • Loading branch information
@9EOR9
9EOR9 committed Feb 21, 2024
commit 5d028ad72281533ef8147ce720300c4fe3bcca1c
5 changes: 0 additions & 5 deletions mysql-test/main/tls_version.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,6 @@
--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)
--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
--exec $MYSQL --host=localhost --ssl --tls_version=TLSv1.0 -e "show status like 'ssl_version';"
# finally list available protocols
--exec $MYSQL --host=localhost --ssl -e "select @@tls_version;"

Expand Down
2 changes: 1 addition & 1 deletion mysql-test/main/tls_version1.opt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
--tls_version=TLSv1.0
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice 😄

--tls_version=TLSv1.1
6 changes: 2 additions & 4 deletions mysql-test/main/tls_version1.result
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
Variable_name Value
Ssl_version TLSv1
Variable_name Value
Ssl_version TLSv1
Ssl_version TLSv1.1
@@tls_version
TLSv1.0
TLSv1.1
call mtr.add_suppression("TLSv1.0 and TLSv1.1 are insecure");
FOUND 1 /TLSv1.0 and TLSv1.1 are insecure/ in mysqld.1.err
3 changes: 0 additions & 3 deletions mysql-test/main/tls_version1.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
--exec $MYSQL --host=localhost --ssl -e "show status like 'ssl_version';"
--error 1
--exec $MYSQL --host=localhost --ssl --tls_version=TLSv1.2 -e "show status like 'ssl_version';"
--error 1
--exec $MYSQL --host=localhost --ssl --tls_version=TLSv1.1 -e "show status like 'ssl_version';"
--exec $MYSQL --host=localhost --ssl --tls_version=TLSv1.0 -e "show status like 'ssl_version';"
--exec $MYSQL --host=localhost --ssl -e "select @@tls_version;"

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