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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
601dcd49
Commit
601dcd49
authored
May 02, 2015
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-7794 MariaDB - mysql-test - fips: some ssl tests with cipher are failing
change openssl_1 test not to use non-FIPS ciphers
parent
7e7dd8e8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
7 deletions
+1
-7
mysql-test/r/openssl_1.result
mysql-test/r/openssl_1.result
+0
-4
mysql-test/t/openssl_1.test
mysql-test/t/openssl_1.test
+1
-3
No files found.
mysql-test/r/openssl_1.result
View file @
601dcd49
...
...
@@ -197,10 +197,6 @@ Variable_name Value
Ssl_cipher DHE-RSA-AES256-SHA
Variable_name Value
Ssl_cipher EDH-RSA-DES-CBC3-SHA
Variable_name Value
Ssl_cipher EDH-RSA-DES-CBC-SHA
Variable_name Value
Ssl_cipher RC4-SHA
select 'is still running; no cipher request crashed the server' as result from dual;
result
is still running; no cipher request crashed the server
...
...
mysql-test/t/openssl_1.test
View file @
601dcd49
...
...
@@ -23,7 +23,7 @@ flush privileges;
connect
(
con1
,
localhost
,
ssl_user1
,,,,,
SSL
-
CIPHER
=
DHE
-
RSA
-
AES256
-
SHA
);
--
replace_result
$MASTER_MYSOCK
MASTER_SOCKET
$MASTER_MYPORT
MASTER_PORT
--
error
ER_ACCESS_DENIED_ERROR
connect
(
con2
,
localhost
,
ssl_user2
,,,,,
SSL
-
CIPHER
=
RC4
-
SHA
);
connect
(
con2
,
localhost
,
ssl_user2
,,,,,
SSL
-
CIPHER
=
AES256
-
SHA
);
connect
(
con2
,
localhost
,
ssl_user2
,,,,,
SSL
-
CIPHER
=
DHE
-
RSA
-
AES256
-
SHA
);
connect
(
con3
,
localhost
,
ssl_user3
,,,,,
SSL
-
CIPHER
=
DHE
-
RSA
-
AES256
-
SHA
);
connect
(
con4
,
localhost
,
ssl_user4
,,,,,
SSL
-
CIPHER
=
DHE
-
RSA
-
AES256
-
SHA
);
...
...
@@ -222,8 +222,6 @@ DROP TABLE t1;
# Common ciphers to openssl and yassl
--
exec
$MYSQL
--
host
=
localhost
-
e
"SHOW STATUS LIKE 'Ssl_cipher';"
--
ssl
-
cipher
=
DHE
-
RSA
-
AES256
-
SHA
--
exec
$MYSQL
--
host
=
localhost
-
e
"SHOW STATUS LIKE 'Ssl_cipher';"
--
ssl
-
cipher
=
EDH
-
RSA
-
DES
-
CBC3
-
SHA
--
exec
$MYSQL
--
host
=
localhost
-
e
"SHOW STATUS LIKE 'Ssl_cipher';"
--
ssl
-
cipher
=
EDH
-
RSA
-
DES
-
CBC
-
SHA
--
exec
$MYSQL
--
host
=
localhost
-
e
"SHOW STATUS LIKE 'Ssl_cipher';"
--
ssl
-
cipher
=
RC4
-
SHA
--
disable_query_log
--
disable_result_log
...
...
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