Skip to content

Commit 31e763d

Browse files
vaintroubvaintroub
committed
MDEV-10211 : fix ssl test not to use specific value of ssl_cipher, as it can change between different openssl/yassl version
1 parent 7d4a7d8 commit 31e763d

File tree

10 files changed

+41
-48
lines changed

10 files changed

+41
-48
lines changed

‎mysql-test/r/openssl_1.result‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ mysqltest: Could not open connection 'default': 2026 SSL connection error: Unabl
5656
SHOW STATUS LIKE 'Ssl_cipher';
5757
Variable_name Value
5858
Ssl_cipher DHE-RSA-AES256-SHA
59-
Variable_name Value
60-
Ssl_cipher DHE-RSA-AES256-SHA
59+
have_ssl
60+
1
6161
End of 5.0 tests
6262
DROP TABLE IF EXISTS thread_status;
6363
DROP EVENT IF EXISTS event_status;
@@ -202,9 +202,9 @@ result
202202
is still running; no cipher request crashed the server
203203
GRANT SELECT ON test.* TO bug42158@localhost REQUIRE X509;
204204
FLUSH PRIVILEGES;
205-
SHOW STATUS LIKE 'Ssl_cipher';
206-
Variable_name Value
207-
Ssl_cipher DHE-RSA-AES256-SHA
205+
SELECT (VARIABLE_VALUE <> '') AS have_ssl FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher';
206+
have_ssl
207+
1
208208
DROP USER bug42158@localhost;
209209
End of 5.1 tests
210210
/*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;

‎mysql-test/r/ssl.result‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
SHOW STATUS LIKE 'Ssl_cipher';
22
Variable_name Value
3-
Ssl_cipher DHE-RSA-AES256-SHA
3+
Ssl_cipher AES128-GCM-SHA256
4+
SELECT (VARIABLE_VALUE <> '') AS have_ssl FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher';
5+
have_ssl
6+
1
47
SHOW STATUS LIKE 'Ssl_server_not_before';
58
Variable_name Value
69
Ssl_server_not_before Apr 25 14:55:05 2015 GMT
@@ -2163,9 +2166,9 @@ Privat (Private Nutzung) Mobilfunk
21632166
Warnings:
21642167
Warning 1052 Column 'kundentyp' in group statement is ambiguous
21652168
drop table t1;
2166-
SHOW STATUS LIKE 'Ssl_cipher';
2167-
Variable_name Value
2168-
Ssl_cipher DHE-RSA-AES256-SHA
2169+
SELECT (VARIABLE_VALUE <> '') AS have_ssl FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher';
2170+
have_ssl
2171+
1
21692172
select aes_decrypt('MySQL','adf');
21702173
aes_decrypt('MySQL','adf')
21712174
NULL

‎mysql-test/r/ssl_ca.result‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,21 @@
44
# try to connect with wrong '--ssl-ca' path : should fail
55
ERROR 2026 (HY000): SSL connection error: SSL_CTX_set_default_verify_paths failed
66
# try to connect with correct '--ssl-ca' path : should connect
7-
Variable_name Value
8-
Ssl_cipher DHE-RSA-AES256-SHA
7+
have_ssl
8+
1
99
#
1010
# Bug#21920678: SSL-CA DOES NOT ACCEPT ~USER TILDE HOME DIRECTORY
1111
# PATH SUBSTITUTION
1212
#
1313
# try to connect with '--ssl-ca' option using tilde home directoy
1414
# path substitution : should connect
15-
Variable_name Value
16-
Ssl_cipher DHE-RSA-AES256-SHA
15+
have_ssl
16+
1
1717
# try to connect with '--ssl-key' option using tilde home directoy
1818
# path substitution : should connect
19-
Variable_name Value
20-
Ssl_cipher DHE-RSA-AES256-SHA
19+
have_ssl
20+
1
2121
# try to connect with '--ssl-cert' option using tilde home directoy
2222
# path substitution : should connect
23-
Variable_name Value
24-
Ssl_cipher DHE-RSA-AES256-SHA
23+
have_ssl
24+
1

‎mysql-test/r/ssl_compress.result‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
SHOW STATUS LIKE 'Ssl_cipher';
2-
Variable_name Value
3-
Ssl_cipher DHE-RSA-AES256-SHA
1+
SELECT (VARIABLE_VALUE <> '') AS have_ssl FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher';
2+
have_ssl
3+
1
44
SHOW STATUS LIKE 'Compression';
55
Variable_name Value
66
Compression ON
@@ -2160,9 +2160,9 @@ Privat (Private Nutzung) Mobilfunk
21602160
Warnings:
21612161
Warning 1052 Column 'kundentyp' in group statement is ambiguous
21622162
drop table t1;
2163-
SHOW STATUS LIKE 'Ssl_cipher';
2164-
Variable_name Value
2165-
Ssl_cipher DHE-RSA-AES256-SHA
2163+
SELECT (VARIABLE_VALUE <> '') AS have_ssl FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher';
2164+
have_ssl
2165+
1
21662166
SHOW STATUS LIKE 'Compression';
21672167
Variable_name Value
21682168
Compression ON

‎mysql-test/r/ssl_timeout.result‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# connect with read timeout so SLEEP() should timeout
22
# Check ssl turned on
3-
SHOW STATUS LIKE 'Ssl_cipher';
4-
Variable_name Value
5-
Ssl_cipher DHE-RSA-AES256-SHA
3+
SELECT (VARIABLE_VALUE <> '') AS have_ssl FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher';
4+
have_ssl
5+
1
66
SELECT SLEEP(600);
77
ERROR HY000: Lost connection to MySQL server during query

‎mysql-test/t/openssl_1.test‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,7 @@ drop table t1;
132132
# verification of servers certificate by setting both ca certificate
133133
# and ca path to NULL
134134
#
135-
--replace_result DHE-RSA-AES256-GCM-SHA384 DHE-RSA-AES256-SHA DHE-RSA-CHACHA20-POLY1305 DHE-RSA-AES256-SHA
136-
--exec $MYSQL --ssl --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1
135+
--exec $MYSQL --ssl --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem -e "SELECT (VARIABLE_VALUE <> '') AS have_ssl FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher'" 2>&1
137136
--echo End of 5.0 tests
138137

139138
#
@@ -257,8 +256,7 @@ select 'is still running; no cipher request crashed the server' as result from d
257256
GRANT SELECT ON test.* TO bug42158@localhost REQUIRE X509;
258257
FLUSH PRIVILEGES;
259258
connect(con1,localhost,bug42158,,,,,SSL);
260-
--replace_result DHE-RSA-AES256-GCM-SHA384 DHE-RSA-AES256-SHA DHE-RSA-CHACHA20-POLY1305 DHE-RSA-AES256-SHA
261-
SHOW STATUS LIKE 'Ssl_cipher';
259+
SELECT (VARIABLE_VALUE <> '') AS have_ssl FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher';
262260
disconnect con1;
263261
connection default;
264262
DROP USER bug42158@localhost;

‎mysql-test/t/ssl.test‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
connect (ssl_con,localhost,root,,,,,SSL);
1212

1313
# Check ssl turned on
14-
--replace_result DHE-RSA-AES256-GCM-SHA384 DHE-RSA-AES256-SHA DHE-RSA-CHACHA20-POLY1305 DHE-RSA-AES256-SHA
1514
SHOW STATUS LIKE 'Ssl_cipher';
15+
SELECT (VARIABLE_VALUE <> '') AS have_ssl FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher';
1616

1717
# Check ssl expiration
1818
SHOW STATUS LIKE 'Ssl_server_not_before';
@@ -22,8 +22,7 @@ SHOW STATUS LIKE 'Ssl_server_not_after';
2222
-- source include/common-tests.inc
2323

2424
# Check ssl turned on
25-
--replace_result DHE-RSA-AES256-GCM-SHA384 DHE-RSA-AES256-SHA DHE-RSA-CHACHA20-POLY1305 DHE-RSA-AES256-SHA
26-
SHOW STATUS LIKE 'Ssl_cipher';
25+
SELECT (VARIABLE_VALUE <> '') AS have_ssl FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher';
2726

2827
#
2928
# MDEV-7697 Client reports ERROR 2006 (MySQL server has gone away) or ERROR 2013 (Lost connection to MySQL server during query) while executing AES* functions under SSL

‎mysql-test/t/ssl_ca.test‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,10 @@
77

88
--echo # try to connect with wrong '--ssl-ca' path : should fail
99
--error 1
10-
--exec $MYSQL --ssl-ca=$MYSQL_TEST_DIR/std_data/wrong-cacert.pem --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem test -e "SHOW STATUS LIKE 'Ssl_cipher'" 2>&1
10+
--exec $MYSQL --ssl-ca=$MYSQL_TEST_DIR/std_data/wrong-cacert.pem --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem test -e "SELECT (VARIABLE_VALUE <> '') AS have_ssl FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher'" 2>&1
1111

1212
--echo # try to connect with correct '--ssl-ca' path : should connect
13-
--replace_result DHE-RSA-AES256-GCM-SHA384 DHE-RSA-AES256-SHA
14-
--exec $MYSQL --ssl-ca=$MYSQL_TEST_DIR/std_data/cacert.pem --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem test -e "SHOW STATUS LIKE 'Ssl_cipher'"
13+
--exec $MYSQL --ssl-ca=$MYSQL_TEST_DIR/std_data/cacert.pem --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem test -e "SELECT (VARIABLE_VALUE <> '') AS have_ssl FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher'"
1514

1615
--echo #
1716
--echo # Bug#21920678: SSL-CA DOES NOT ACCEPT ~USER TILDE HOME DIRECTORY
@@ -22,15 +21,12 @@
2221

2322
--echo # try to connect with '--ssl-ca' option using tilde home directoy
2423
--echo # path substitution : should connect
25-
--replace_result DHE-RSA-AES256-GCM-SHA384 DHE-RSA-AES256-SHA
26-
--exec $MYSQL --ssl-ca$mysql_test_dir_path/std_data/cacert.pem --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem test -e "SHOW STATUS LIKE 'Ssl_cipher'"
24+
--exec $MYSQL --ssl-ca$mysql_test_dir_path/std_data/cacert.pem --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem test -e "SELECT (VARIABLE_VALUE <> '') AS have_ssl FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher'"
2725

2826
--echo # try to connect with '--ssl-key' option using tilde home directoy
2927
--echo # path substitution : should connect
30-
--replace_result DHE-RSA-AES256-GCM-SHA384 DHE-RSA-AES256-SHA
31-
--exec $MYSQL --ssl-ca=$MYSQL_TEST_DIR/std_data/cacert.pem --ssl-key$mysql_test_dir_path/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem test -e "SHOW STATUS LIKE 'Ssl_cipher'"
28+
--exec $MYSQL --ssl-ca=$MYSQL_TEST_DIR/std_data/cacert.pem --ssl-key$mysql_test_dir_path/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem test -e "SELECT (VARIABLE_VALUE <> '') AS have_ssl FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher'"
3229

3330
--echo # try to connect with '--ssl-cert' option using tilde home directoy
3431
--echo # path substitution : should connect
35-
--replace_result DHE-RSA-AES256-GCM-SHA384 DHE-RSA-AES256-SHA
36-
--exec $MYSQL --ssl-ca=$MYSQL_TEST_DIR/std_data/cacert.pem --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert$mysql_test_dir_path/std_data/client-cert.pem test -e "SHOW STATUS LIKE 'Ssl_cipher'"
32+
--exec $MYSQL --ssl-ca=$MYSQL_TEST_DIR/std_data/cacert.pem --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert$mysql_test_dir_path/std_data/client-cert.pem test -e "SELECT (VARIABLE_VALUE <> '') AS have_ssl FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher'"

‎mysql-test/t/ssl_compress.test‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@
1111
connect (ssl_compress_con,localhost,root,,,,,SSL COMPRESS);
1212

1313
# Check ssl turned on
14-
--replace_result DHE-RSA-AES256-GCM-SHA384 DHE-RSA-AES256-SHA DHE-RSA-CHACHA20-POLY1305 DHE-RSA-AES256-SHA
15-
SHOW STATUS LIKE 'Ssl_cipher';
14+
SELECT (VARIABLE_VALUE <> '') AS have_ssl FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher';
1615

1716
# Check compression turned on
1817
SHOW STATUS LIKE 'Compression';
@@ -21,8 +20,7 @@ SHOW STATUS LIKE 'Compression';
2120
-- source include/common-tests.inc
2221

2322
# Check ssl turned on
24-
--replace_result DHE-RSA-AES256-GCM-SHA384 DHE-RSA-AES256-SHA DHE-RSA-CHACHA20-POLY1305 DHE-RSA-AES256-SHA
25-
SHOW STATUS LIKE 'Ssl_cipher';
23+
SELECT (VARIABLE_VALUE <> '') AS have_ssl FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher';
2624

2725
# Check compression turned on
2826
SHOW STATUS LIKE 'Compression';

‎mysql-test/t/ssl_timeout.test‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
connect (ssl_con,localhost,root,,,,,SSL read_timeout=5);
88

99
--echo # Check ssl turned on
10-
--replace_result DHE-RSA-AES256-GCM-SHA384 DHE-RSA-AES256-SHA DHE-RSA-CHACHA20-POLY1305 DHE-RSA-AES256-SHA
11-
SHOW STATUS LIKE 'Ssl_cipher';
10+
SELECT (VARIABLE_VALUE <> '') AS have_ssl FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher';
1211

1312
# --error CR_SERVER_LOST
1413
--error 2013

0 commit comments

Comments
 (0)