From e116f11f0aeb740667294185534c859928dc125d Mon Sep 17 00:00:00 2001
From: Vladislav Vaintroub <wlad@mariadb.com>
Date: Wed, 24 Apr 2019 11:15:08 +0200
Subject: 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.
---
 mysql-test/r/ssl.result           | 4 ++--
 mysql-test/r/ssl_verify_ip.result | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 mysql-test/r/ssl_verify_ip.result

(limited to 'mysql-test/r')

diff --git a/mysql-test/r/ssl.result b/mysql-test/r/ssl.result
index 05ba7519781..f45202b13ab 100644
--- a/mysql-test/r/ssl.result
+++ b/mysql-test/r/ssl.result
@@ -3,10 +3,10 @@ have_ssl
 1
 SHOW STATUS LIKE 'Ssl_server_not_before';
 Variable_name	Value
-Ssl_server_not_before	Apr 25 20:52:21 2017 GMT
+Ssl_server_not_before	Apr 24 14:29:39 2019 GMT
 SHOW STATUS LIKE 'Ssl_server_not_after';
 Variable_name	Value
-Ssl_server_not_after	Apr 20 20:52:21 2037 GMT
+Ssl_server_not_after	Apr 19 14:29:39 2039 GMT
 drop table if exists t1,t2,t3,t4;
 CREATE TABLE t1 (
 Period smallint(4) unsigned zerofill DEFAULT '0000' NOT NULL,
diff --git a/mysql-test/r/ssl_verify_ip.result b/mysql-test/r/ssl_verify_ip.result
new file mode 100644
index 00000000000..98fb6a68656
--- /dev/null
+++ b/mysql-test/r/ssl_verify_ip.result
@@ -0,0 +1,4 @@
+1
+1
+1
+1
-- 
cgit v1.2.1