Skip to content

M
mariadb
Commit 5d57e2d8 authored by Vicențiu Ciorbaru's avatar Vicențiu Ciorbaru
Browse files
Options

Fix tests for 7937

parent be5035b4
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 22 deletions
mysql-test/include/have_ssl_disabled.inc
View file @ 5d57e2d8
-- require r/have_ssl_disabled.require if (`SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME like 'have_ssl' and VARIABLE_VALUE like 'DISABLED'`)
disable_query_log; {
show variables like 'have_ssl'; --skip Test requires ssl to be disabled.
enable_query_log; }
mysql-test/r/have_ssl_disabled.require deleted 100644 → 0
View file @ be5035b4
Variable_name Value
have_ssl DISABLED
mysql-test/r/ssl_7937.result
View file @ 5d57e2d8
/home/vicentiu/Workspace/MariaDB/server/client/mysql --defaults-file=/home/vicentiu/Workspace/MariaDB/server/mysql-test/var/my.cnf --ssl-key=/home/vicentiu/Workspace/MariaDB/server/mysql-test/std_data/client-key.pem --ssl-cert=/home/vicentiu/Workspace/MariaDB/server/mysql-test/std_data/client-cert.pem -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1;
Variable_name Value Variable_name Value
Ssl_cipher DHE-RSA-AES256-GCM-SHA384 Ssl_cipher DHE-RSA-AES256-GCM-SHA384
# #
/home/vicentiu/Workspace/MariaDB/server/client/mysql --defaults-file=/home/vicentiu/Workspace/MariaDB/server/mysql-test/var/my.cnf --ssl -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1;
Variable_name Value Variable_name Value
Ssl_cipher DHE-RSA-AES256-GCM-SHA384 Ssl_cipher DHE-RSA-AES256-GCM-SHA384
# #
/home/vicentiu/Workspace/MariaDB/server/client/mysql --defaults-file=/home/vicentiu/Workspace/MariaDB/server/mysql-test/var/my.cnf --ssl --ssl-verify-server-cert -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1;
ERROR 2026 (HY000): SSL connection error: Failed to verify the server certificate ERROR 2026 (HY000): SSL connection error: Failed to verify the server certificate
# #
/home/vicentiu/Workspace/MariaDB/server/client/mysql --defaults-file=/home/vicentiu/Workspace/MariaDB/server/mysql-test/var/my.cnf --ssl-key=/home/vicentiu/Workspace/MariaDB/server/mysql-test/std_data/client-key.pem --ssl-cert=/home/vicentiu/Workspace/MariaDB/server/mysql-test/std_data/client-cert.pem --ssl-verify-server-cert -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1;
ERROR 2026 (HY000): SSL connection error: Failed to verify the server certificate ERROR 2026 (HY000): SSL connection error: Failed to verify the server certificate
mysql-test/r/ssl_without_7937.result
View file @ 5d57e2d8
/home/vicentiu/Workspace/MariaDB/server/client/mysql --defaults-file=/home/vicentiu/Workspace/MariaDB/server/mysql-test/var/my.cnf --ssl-key=/home/vicentiu/Workspace/MariaDB/server/mysql-test/std_data/client-key.pem --ssl-cert=/home/vicentiu/Workspace/MariaDB/server/mysql-test/std_data/client-cert.pem -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1;
Variable_name Value Variable_name Value
Ssl_cipher Ssl_cipher
/home/vicentiu/Workspace/MariaDB/server/client/mysql --defaults-file=/home/vicentiu/Workspace/MariaDB/server/mysql-test/var/my.cnf --ssl-key=/home/vicentiu/Workspace/MariaDB/server/mysql-test/std_data/client-key.pem --ssl-cert=/home/vicentiu/Workspace/MariaDB/server/mysql-test/std_data/client-cert.pem --ssl_verify_server_cert -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1;
ERROR 2026 (HY000): SSL connection error: SSL is required, but the server does not support it ERROR 2026 (HY000): SSL connection error: SSL is required, but the server does not support it
/home/vicentiu/Workspace/MariaDB/server/client/mysql --defaults-file=/home/vicentiu/Workspace/MariaDB/server/mysql-test/var/my.cnf --ssl_verify_server_cert -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1;
Variable_name Value Variable_name Value
Ssl_cipher Ssl_cipher
/home/vicentiu/Workspace/MariaDB/server/client/mysql --defaults-file=/home/vicentiu/Workspace/MariaDB/server/mysql-test/var/my.cnf --ssl --ssl_verify_server_cert -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1
ERROR 2026 (HY000): SSL connection error: SSL is required, but the server does not support it ERROR 2026 (HY000): SSL connection error: SSL is required, but the server does not support it
mysql-test/t/ssl_7937.test
View file @ 5d57e2d8
...@@ -5,17 +5,13 @@ let $mysql_ssl_no_cert=$MYSQL --ssl -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1; ...@@ -5,17 +5,13 @@ let $mysql_ssl_no_cert=$MYSQL --ssl -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1;
let $mysql_ssl_no_cert_ver=$MYSQL --ssl --ssl-verify-server-cert -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1; let $mysql_ssl_no_cert_ver=$MYSQL --ssl --ssl-verify-server-cert -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1;
let $mysql_ssl_cert_ver=$MYSQL --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem --ssl-verify-server-cert -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1; let $mysql_ssl_cert_ver=$MYSQL --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem --ssl-verify-server-cert -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1;
--echo $mysql_ssl_cert;
--exec $mysql_ssl_cert; --exec $mysql_ssl_cert;
--echo # --echo #
--echo $mysql_ssl_no_cert;
--exec $mysql_ssl_no_cert; --exec $mysql_ssl_no_cert;
--echo # --echo #
--echo $mysql_ssl_no_cert_ver;
--error 1 --error 1
--exec $mysql_ssl_no_cert_ver; --exec $mysql_ssl_no_cert_ver;
--echo # --echo #
--echo $mysql_ssl_cert_ver;
--error 1 --error 1
--exec $mysql_ssl_cert_ver; --exec $mysql_ssl_cert_ver;
mysql-test/t/ssl_without_7937.test
View file @ 5d57e2d8
...@@ -4,19 +4,15 @@ source include/have_ssl_disabled.inc; ...@@ -4,19 +4,15 @@ source include/have_ssl_disabled.inc;
let $mysql_ssl_cert=$MYSQL --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; let $mysql_ssl_cert=$MYSQL --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;
# SSL mandatory with verify server cert # SSL mandatory with verify server cert
let $mysql_ssl_cert_ver=$MYSQL --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem --ssl_verify_server_cert -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1; let $mysql_ssl_cert_ver=$MYSQL --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem --ssl_verify_server_cert -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1;
--echo $mysql_ssl_cert;
--exec $mysql_ssl_cert; --exec $mysql_ssl_cert;
--echo $mysql_ssl_cert_ver;
--error 1 --error 1
--exec $mysql_ssl_cert_ver; --exec $mysql_ssl_cert_ver;
# SSL not mandatory again # SSL not mandatory again
let $mysql_no_ssl_but_ver=$MYSQL --ssl_verify_server_cert -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1; let $mysql_no_ssl_but_ver=$MYSQL --ssl_verify_server_cert -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1;
--echo $mysql_no_ssl_but_ver;
--exec $mysql_no_ssl_but_ver; --exec $mysql_no_ssl_but_ver;
# SSL mandatory but no specifications for ssl parameters # SSL mandatory but no specifications for ssl parameters
let $mysql_ssl_no_spec_ver=$MYSQL --ssl --ssl_verify_server_cert -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1; let $mysql_ssl_no_spec_ver=$MYSQL --ssl --ssl_verify_server_cert -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1;
--echo $mysql_ssl_no_spec_ver
--error 1 --error 1
--exec $mysql_ssl_no_spec_ver --exec $mysql_ssl_no_spec_ver
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7