Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
84f99acb
Commit
84f99acb
authored
Mar 15, 2024
by
Sergei Golubchik
Committed by
Oleksandr Byelkin
May 21, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix SSL tests for the new C/C 3.4
it no longer supports TLSv1.0
parent
99b370e0
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
18 additions
and
37 deletions
+18
-37
mysql-test/main/tls_version.result
mysql-test/main/tls_version.result
+10
-0
mysql-test/main/tls_version.test
mysql-test/main/tls_version.test
+8
-11
mysql-test/main/tls_version1.opt
mysql-test/main/tls_version1.opt
+0
-1
mysql-test/main/tls_version1.result
mysql-test/main/tls_version1.result
+0
-8
mysql-test/main/tls_version1.test
mysql-test/main/tls_version1.test
+0
-17
No files found.
mysql-test/main/tls_version.result
View file @
84f99acb
#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");
...
...
mysql-test/main/tls_version.test
View file @
84f99acb
...
...
@@ -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"
);
...
...
mysql-test/main/tls_version1.opt
deleted
100644 → 0
View file @
99b370e0
--tls_version=TLSv1.0
mysql-test/main/tls_version1.result
deleted
100644 → 0
View file @
99b370e0
Variable_name Value
Ssl_version TLSv1
Variable_name Value
Ssl_version TLSv1
@@tls_version
TLSv1.0
call mtr.add_suppression("TLSv1.0 and TLSv1.1 are insecure");
FOUND 1 /TLSv1.0 and TLSv1.1 are insecure/ in mysqld.1.err
mysql-test/main/tls_version1.test
deleted
100644 → 0
View file @
99b370e0
# Tests for SSL connections, only run if mysqld is compiled
# with support for SSL.
--
source
include
/
have_ssl_communication
.
inc
--
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"
);
--
let
SEARCH_FILE
=
$MYSQLTEST_VARDIR
/
log
/
mysqld
.
1.
err
--
let
SEARCH_PATTERN
=
TLSv1
.
0
and
TLSv1
.
1
are
insecure
--
source
include
/
search_pattern_in_file
.
inc
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment