diff options
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/include/have_ssl_crypto_functs.inc | 2 | ||||
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 1 | ||||
| -rw-r--r-- | mysql-test/r/ssl_ca.result | 16 | ||||
| -rw-r--r-- | mysql-test/suite.pm | 6 | ||||
| -rw-r--r-- | mysql-test/t/ssl_ca.test | 19 | ||||
| -rw-r--r-- | mysql-test/t/ssl_cert_verify.test | 2 |
6 files changed, 6 insertions, 40 deletions
diff --git a/mysql-test/include/have_ssl_crypto_functs.inc b/mysql-test/include/have_ssl_crypto_functs.inc index 2204c81db39..0de1b8a0f11 100644 --- a/mysql-test/include/have_ssl_crypto_functs.inc +++ b/mysql-test/include/have_ssl_crypto_functs.inc @@ -1,4 +1,4 @@ if (`SELECT count(*) = 0 FROM information_schema.GLOBAL_VARIABLES WHERE VARIABLE_NAME = 'have_ssl' AND VARIABLE_VALUE <> 'NO'`){ - skip Needs SSL; + skip Needs OpenSSL; } diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index bbe98c599ec..f42fc1ce9ee 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -1714,6 +1714,7 @@ sub command_line_setup { { # Set valgrind_option unless already defined push(@valgrind_args, ("--show-reachable=yes", "--leak-check=yes", + "--track-origins=yes", "-v", "--num-callers=16")) unless @valgrind_args; unshift(@valgrind_args, "--tool=memcheck"); diff --git a/mysql-test/r/ssl_ca.result b/mysql-test/r/ssl_ca.result index 8ea3e30eb06..afffe4e4dff 100644 --- a/mysql-test/r/ssl_ca.result +++ b/mysql-test/r/ssl_ca.result @@ -6,19 +6,3 @@ ERROR 2026 (HY000): SSL connection error: xxxx # try to connect with correct '--ssl-ca' path : should connect have_ssl 1 -# -# Bug#21920678: SSL-CA DOES NOT ACCEPT ~USER TILDE HOME DIRECTORY -# PATH SUBSTITUTION -# -# try to connect with '--ssl-ca' option using tilde home directoy -# path substitution : should connect -have_ssl -1 -# try to connect with '--ssl-key' option using tilde home directoy -# path substitution : should connect -have_ssl -1 -# try to connect with '--ssl-cert' option using tilde home directoy -# path substitution : should connect -have_ssl -1 diff --git a/mysql-test/suite.pm b/mysql-test/suite.pm index ea07af7376c..9e1452a6a9b 100644 --- a/mysql-test/suite.pm +++ b/mysql-test/suite.pm @@ -62,9 +62,9 @@ sub skip_combinations { } $skip{'include/check_ipv6.inc'} = 'No IPv6' unless ipv6_ok(); - $skip{'t/openssl_6975.test'} = 'no or too old openssl' - unless $::mysqld_variables{'version-ssl-library'} =~ /OpenSSL (\S+)/ - and $1 ge "1.0.1d"; +# $skip{'t/openssl_6975.test'} = 'no or too old openssl' +# unless $::mysqld_variables{'version-ssl-library'} =~ /OpenSSL (\S+)/ +# and $1 ge "1.0.1d"; %skip; } diff --git a/mysql-test/t/ssl_ca.test b/mysql-test/t/ssl_ca.test index 5870d9598fc..106da140130 100644 --- a/mysql-test/t/ssl_ca.test +++ b/mysql-test/t/ssl_ca.test @@ -14,22 +14,3 @@ --echo # try to connect with correct '--ssl-ca' path : should connect --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';" - ---echo # ---echo # Bug#21920678: SSL-CA DOES NOT ACCEPT ~USER TILDE HOME DIRECTORY ---echo # PATH SUBSTITUTION ---echo # - ---let $mysql_test_dir_path= `SELECT IF(LENGTH('$HOME'), REPLACE('=$MYSQL_TEST_DIR', '=$HOME', '=~'), '=$MYSQL_TEST_DIR')` - ---echo # try to connect with '--ssl-ca' option using tilde home directoy ---echo # path substitution : should connect ---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';" - ---echo # try to connect with '--ssl-key' option using tilde home directoy ---echo # path substitution : should connect ---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';" - ---echo # try to connect with '--ssl-cert' option using tilde home directoy ---echo # path substitution : should connect ---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';" diff --git a/mysql-test/t/ssl_cert_verify.test b/mysql-test/t/ssl_cert_verify.test index 83f621b7ca9..65f182b02e1 100644 --- a/mysql-test/t/ssl_cert_verify.test +++ b/mysql-test/t/ssl_cert_verify.test @@ -30,7 +30,7 @@ let $ssl_verify_pass_path = --ssl --ssl-ca=$MYSQL_TEST_DIR/std_data/ca-cert-veri --enable_reconnect --source include/wait_until_connected_again.inc ---replace_result TLSv1.2 TLS_VERSION TLSv1.1 TLS_VERSION TLSv1 TLS_VERSION +--replace_result TLSv1.2 TLS_VERSION TLSv1.1 TLS_VERSION TLSv1 TLS_VERSION TLS1.2 TLS_VERSION TLS1.1 TLS_VERSION TLS1.0 TLS_VERSION --exec $MYSQL --protocol=tcp --ssl-ca=$MYSQL_TEST_DIR/std_data/ca-cert-verify.pem --ssl-verify-server-cert -e "SHOW STATUS like 'Ssl_version'" --echo # restart server using restart |