diff options
author | Vladislav Vaintroub <wlad@mariadb.com> | 2019-04-24 11:15:08 +0200 |
---|---|---|
committer | Vladislav Vaintroub <wlad@mariadb.com> | 2019-04-28 12:49:59 +0200 |
commit | e116f11f0aeb740667294185534c859928dc125d (patch) | |
tree | 987944514ecc5fc1b865be3c1638488f6e0a7c7c /mysql-test/suite.pm | |
parent | eb9b03ab488d160aee487389605941a584e6074d (diff) | |
download | mariadb-git-e116f11f0aeb740667294185534c859928dc125d.tar.gz |
MDEV-18131 MariaDB does not verify IP addresses from subject alternative
names
Added a call to X509_check_ip_asc() in case server_hostname represents
an IP address.
Diffstat (limited to 'mysql-test/suite.pm')
-rw-r--r-- | mysql-test/suite.pm | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mysql-test/suite.pm b/mysql-test/suite.pm index 959329d1641..f90679e6f1f 100644 --- a/mysql-test/suite.pm +++ b/mysql-test/suite.pm @@ -72,10 +72,15 @@ sub skip_combinations { unless $::mysqld_variables{'version-ssl-library'} =~ /OpenSSL (\S+)/ and $1 ge "1.0.1d"; + $skip{'t/ssl_7937.combinations'} = [ 'x509v3' ] unless $::mysqld_variables{'version-ssl-library'} =~ /OpenSSL (\S+)/ and $1 ge "1.0.2"; + $skip{'t/ssl_verify_ip.test'} = 'x509v3 support required' + unless $::mysqld_variables{'version-ssl-library'} =~ /OpenSSL (\S+)/ + and $1 ge "1.0.2"; + %skip; } |