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/lib/generate-ssl-certs.sh   |   2 +-
 mysql-test/r/ssl.result                |   4 +-
 mysql-test/r/ssl_verify_ip.result      |   4 +
 mysql-test/std_data/cacert.pem         | 116 ++++++++--------
 mysql-test/std_data/cakey.pem          |  52 +++----
 mysql-test/std_data/client-cert.pem    |  84 ++++++------
 mysql-test/std_data/client-key.pem     |  26 ++--
 mysql-test/std_data/server-cert.pem    |  84 ++++++------
 mysql-test/std_data/server-key.pem     |  26 ++--
 mysql-test/std_data/server8k-cert.pem  | 242 ++++++++++++++++-----------------
 mysql-test/std_data/server8k-key.pem   | 194 +++++++++++++-------------
 mysql-test/std_data/serversan-cert.pem |  80 +++++------
 mysql-test/std_data/serversan-key.pem  |  28 ++--
 mysql-test/suite.pm                    |   5 +
 mysql-test/t/ssl_verify_ip.opt         |   3 +
 mysql-test/t/ssl_verify_ip.test        |   3 +
 sql-common/client.c                    |   6 +-
 17 files changed, 488 insertions(+), 471 deletions(-)
 create mode 100644 mysql-test/r/ssl_verify_ip.result
 create mode 100644 mysql-test/t/ssl_verify_ip.opt
 create mode 100644 mysql-test/t/ssl_verify_ip.test

diff --git a/mysql-test/lib/generate-ssl-certs.sh b/mysql-test/lib/generate-ssl-certs.sh
index 8f15ba9d521..4b333854c08 100755
--- a/mysql-test/lib/generate-ssl-certs.sh
+++ b/mysql-test/lib/generate-ssl-certs.sh
@@ -31,7 +31,7 @@ openssl ca -keyfile cakey.pem -days 7300 -batch -cert cacert.pem -policy policy_
 
 # with SubjectAltName, only for OpenSSL 1.0.2+
 cat > demoCA/sanext.conf <<EOF
-subjectAltName=DNS:localhost
+subjectAltName=IP:127.0.0.1, DNS:localhost
 EOF
 openssl req -newkey rsa:1024 -keyout serversan-key.pem -out demoCA/serversan-req.pem -days 7300 -nodes -subj '/CN=server/C=FI/ST=Helsinki/L=Helsinki/O=MariaDB'
 openssl ca -keyfile cakey.pem -extfile demoCA/sanext.conf -days 7300 -batch -cert cacert.pem -policy policy_anything -out serversan-cert.pem -infiles demoCA/serversan-req.pem
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
diff --git a/mysql-test/std_data/cacert.pem b/mysql-test/std_data/cacert.pem
index cc5d9100e30..a8fc32424af 100644
--- a/mysql-test/std_data/cacert.pem
+++ b/mysql-test/std_data/cacert.pem
@@ -2,78 +2,78 @@ Certificate:
     Data:
         Version: 3 (0x2)
         Serial Number:
-            e5:b1:e3:71:e9:6f:a9:e1
+            c8:ae:a5:b8:5b:90:50:49
     Signature Algorithm: sha256WithRSAEncryption
-        Issuer: CN=cacert, C=FI, ST=Helsinki, L=Helsinki, O=MariaDB
+        Issuer: CN = cacert, C = FI, ST = Helsinki, L = Helsinki, O = MariaDB
         Validity
-            Not Before: Apr 25 20:52:21 2017 GMT
-            Not After : Apr 20 20:52:21 2037 GMT
-        Subject: CN=cacert, C=FI, ST=Helsinki, L=Helsinki, O=MariaDB
+            Not Before: Apr 24 14:29:39 2019 GMT
+            Not After : Apr 19 14:29:39 2039 GMT
+        Subject: CN = cacert, C = FI, ST = Helsinki, L = Helsinki, O = MariaDB
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
                 Public-Key: (2048 bit)
                 Modulus:
-                    00:a0:ad:d5:b1:ec:45:6f:d6:33:fc:5a:03:29:14:
-                    f1:8e:78:d5:27:53:79:e0:92:7c:10:3b:79:a0:d7:
-                    b6:9d:a8:5c:4d:fa:68:11:b3:03:9e:ee:5e:20:79:
-                    23:d8:9c:49:34:9c:1d:c4:6e:53:1f:9a:92:1f:08:
-                    c1:15:e2:ad:cf:59:cd:1e:55:84:79:f9:09:ca:36:
-                    8a:50:83:c6:38:48:c6:d3:fa:f6:f2:2a:4f:bd:5d:
-                    60:9d:eb:21:c4:8c:f2:dd:2d:49:10:63:46:47:de:
-                    2d:59:a0:4a:e0:58:e6:c0:ae:d8:d4:5e:9a:f8:f5:
-                    68:1d:ea:80:8a:d6:01:b0:d5:5f:30:4d:88:5a:c5:
-                    1f:81:92:c1:40:54:c8:bb:a6:a1:43:de:81:3c:4b:
-                    79:95:82:bb:52:da:a3:a4:a0:69:ff:7e:00:8c:86:
-                    85:ec:af:03:68:a8:83:48:a0:e4:1d:31:a9:5c:47:
-                    99:9d:3a:3f:b5:3e:12:7c:4d:47:15:72:f1:11:5c:
-                    4a:ef:08:1c:7b:8f:e6:03:06:07:4f:94:21:b0:5e:
-                    27:fa:93:8c:b4:cc:56:34:3b:6d:c4:4a:14:57:b2:
-                    21:1a:3e:2f:c5:9e:47:1a:59:05:22:0e:56:b1:a7:
-                    e8:80:9b:82:c3:54:57:12:05:94:79:a2:03:d9:64:
-                    3c:63
+                    00:d6:d4:5c:62:a3:d7:9a:8e:f3:60:a5:f2:07:64:
+                    bd:f8:2e:16:73:44:1e:4c:5a:96:07:08:88:84:d0:
+                    4d:15:83:0c:af:65:4c:55:42:96:14:82:f8:00:66:
+                    5b:2c:b5:7b:e7:44:a5:aa:4e:63:e1:d9:88:05:2a:
+                    80:c2:f2:4d:70:eb:63:24:7f:f9:d9:70:13:53:cb:
+                    45:12:0c:3c:1e:d2:ce:08:f9:b9:e0:bf:8d:6b:0c:
+                    b9:29:99:31:96:f9:b6:b0:fd:e5:14:d9:e7:3b:77:
+                    26:5c:c1:e3:54:c7:63:e0:a3:30:de:86:06:19:0f:
+                    7e:04:d2:d2:d3:f0:78:23:21:79:3c:9a:42:41:6e:
+                    53:36:de:dc:0f:c7:98:8a:85:79:0a:d4:ef:90:02:
+                    1b:12:3a:60:32:6c:54:c5:8a:7f:74:24:0e:d3:08:
+                    5b:d2:e6:ae:de:17:47:8f:4d:ae:13:00:67:45:e6:
+                    bc:0e:ee:1b:0d:44:b2:0c:25:6d:b8:38:5c:87:c1:
+                    d3:98:27:a1:56:21:5c:42:15:b3:f4:b7:ec:ae:bd:
+                    ae:af:e4:50:0d:34:7c:3c:e1:b1:64:f6:e4:07:53:
+                    9d:96:44:8a:41:e0:3c:df:f2:fc:6d:de:f7:5d:8c:
+                    04:ca:e1:4f:cc:a5:c5:0c:ce:a8:f7:49:b5:63:6b:
+                    02:53
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Subject Key Identifier: 
-                1C:C7:2B:AA:1B:B1:BB:2E:9A:F4:0F:B1:86:60:57:38:C2:41:05:12
+                F3:1D:A0:5F:69:33:8A:A4:B4:76:97:A2:6E:AB:FD:A0:BF:F3:2C:CE
             X509v3 Authority Key Identifier: 
-                keyid:1C:C7:2B:AA:1B:B1:BB:2E:9A:F4:0F:B1:86:60:57:38:C2:41:05:12
+                keyid:F3:1D:A0:5F:69:33:8A:A4:B4:76:97:A2:6E:AB:FD:A0:BF:F3:2C:CE
 
-            X509v3 Basic Constraints: 
+            X509v3 Basic Constraints: critical
                 CA:TRUE
     Signature Algorithm: sha256WithRSAEncryption
-         0d:4b:21:52:fa:49:34:56:14:db:83:ae:1c:3d:a7:4d:3e:ea:
-         55:7e:1a:37:7a:65:89:ee:19:05:94:9d:3a:ad:59:c4:38:16:
-         b2:bd:02:ee:5a:a6:7e:e2:b1:21:a3:ad:af:8c:ae:c3:30:71:
-         ad:d7:d2:24:0f:c4:d9:47:80:c5:95:05:1d:7c:8a:49:0a:7d:
-         8b:61:ca:b5:68:3d:3e:4e:f1:c7:45:62:c8:cc:a9:2f:f3:12:
-         f1:3f:92:34:7f:07:ab:d3:ac:ab:af:2d:c9:69:63:8a:b2:e5:
-         35:ea:7d:b8:17:38:72:82:5f:96:3d:dc:8d:e5:11:bb:ae:f3:
-         02:2d:20:77:5c:64:59:18:a6:e7:fa:c7:89:e8:30:12:14:04:
-         40:5b:e9:b1:8f:86:81:b9:0d:6c:b6:fc:98:f9:b7:52:ab:8f:
-         7e:53:c8:a0:05:e4:cd:0d:6b:d2:74:9f:17:7a:a1:c3:76:5e:
-         f3:29:1c:c6:be:56:ab:02:f7:5d:e1:c9:21:27:6d:66:7a:41:
-         29:49:a3:f8:f5:2a:e7:03:2a:7c:52:4b:f5:46:58:45:be:a4:
-         4c:a0:65:37:1d:d8:ac:f8:1f:81:ca:9c:79:f0:ff:22:8c:1d:
-         ce:2b:d0:1e:ce:99:f2:db:fa:66:84:e6:86:6f:19:3b:10:f1:
-         92:ac:57:b2
+         0c:1b:af:48:e0:29:ff:d5:23:27:4f:0b:f6:4d:d3:c6:73:13:
+         ee:fa:ba:84:9e:22:c6:c4:35:11:d3:aa:42:11:a5:4f:97:39:
+         72:d5:eb:6e:3e:d1:75:dc:51:bc:bc:ab:2a:0d:28:aa:3a:2e:
+         f1:7f:ae:a0:16:27:07:2e:a3:f1:06:ed:33:9b:8f:b5:3a:ca:
+         8c:a7:e8:fe:b9:a4:b3:4e:c1:27:7d:7b:23:33:10:fe:27:4b:
+         a2:b1:6a:32:09:30:84:24:d2:1d:02:9d:41:3b:ba:4e:51:ff:
+         ce:98:c3:c9:9a:22:b8:ac:21:5b:c3:89:28:8e:3b:6a:9c:d3:
+         5f:ef:99:6d:ac:f5:56:81:09:97:22:31:96:49:b8:75:1d:71:
+         5c:76:7d:64:87:77:18:30:4e:43:f7:c3:1a:f9:d5:cf:97:29:
+         28:cf:40:84:da:35:29:bc:f6:9a:9e:e9:ce:f8:cc:57:02:41:
+         13:d1:60:18:41:60:b7:17:c6:b6:6d:71:d8:20:50:56:13:3c:
+         6c:23:0e:91:1b:2f:8d:31:e8:82:da:71:5f:6c:1c:3f:f6:7f:
+         2c:30:47:eb:89:c6:28:9b:61:62:43:e2:3a:91:48:0b:1e:2a:
+         c0:d9:a0:59:69:4f:13:58:cc:4a:8a:37:2e:c6:c1:a1:7b:03:
+         4a:e5:cb:98
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
 -----END CERTIFICATE-----
diff --git a/mysql-test/std_data/cakey.pem b/mysql-test/std_data/cakey.pem
index 88e251f00e2..56c25057f43 100644
--- a/mysql-test/std_data/cakey.pem
+++ b/mysql-test/std_data/cakey.pem
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCgrdWx7EVv1jP8
-WgMpFPGOeNUnU3ngknwQO3mg17adqFxN+mgRswOe7l4geSPYnEk0nB3EblMfmpIf
-CMEV4q3PWc0eVYR5+QnKNopQg8Y4SMbT+vbyKk+9XWCd6yHEjPLdLUkQY0ZH3i1Z
-oErgWObArtjUXpr49Wgd6oCK1gGw1V8wTYhaxR+BksFAVMi7pqFD3oE8S3mVgrtS
-2qOkoGn/fgCMhoXsrwNoqINIoOQdMalcR5mdOj+1PhJ8TUcVcvERXErvCBx7j+YD
-BgdPlCGwXif6k4y0zFY0O23EShRXsiEaPi/FnkcaWQUiDlaxp+iAm4LDVFcSBZR5
-ogPZZDxjAgMBAAECggEAWmy6AGFpSmEP7IpzkOEaeAWEX5dY1YtaioAOGPiM6vje
-yXuMqblG5mBbVIcYJ0T85cCd9/fmi7ifVxvEHh7tle2Bw/p4jXQbkFNVT655FR/P
-1Wg9JVeufHFaeETlQgnYe6SKo9BaswNUHkZZHRyq7/D2Ub3UFRt2tq9MG9YIKY1m
-rP9s7E+EDuH9UhYmaWdQfNm8muIXWK8WjicI5+PX0CQ1NtUy6vS7qBzcBzvT0chC
-Jtja29S6Nvg12A96nHsRmQyUaQjRlqosSwiagpc5mZmNeCEUoY+3deIdYIUMSQnf
-judZOKVPq0GOW5Y1U068LGODWaifPkinGBj+04VH0QKBgQDOp/jVCOUdEeqFJ/8m
-wEsfsRIrXvtGJHgbDXcVJ69FwlX+yaKGEuC+4f21uyxPn6GoFw+NKAyTmGKH7VAX
-OFQLrMQ/DMlNbZrCAAFcXMqrnLaVwqMeIIoVNfKAa8u15K40qc+B0it61Nlay5wq
-wvXoSZrdqXSgsI29pav20+8pTQKBgQDHC3l1+gMZ1rCar+5KdVBN1Wq4Xh7cwZw6
-FxEvyrDCJePEU2L7FpH1pFuB4WpXdBu3CPo70ZgwfqBXn4qLOOI3gTtDHActyiUm
-+WRG62O+5Ye7aLB4xy0MfnKNA2g/yHj1ozwM8kA5JRptAzDnzWfVE0k47/pVAVzt
-E2bZuSykbwKBgQCL6SkMgjMr1T9j20phn/q8gBN/DZUtTe+K0Tj4N5/wqLuz/its
-fkdutG4ipZBAcCDwPnym4qBxJNBAmqiIr/gm11ceILgBFd2azoodUC1etoDfL6Fj
-+j/CUH3X+CM5CJPwz67Pg80wIf7t+7/FK611ELAqtllhmWa9KPcd6yqWWQKBgHh5
-Xnvk5kmWY3BNOgrBNOjXWu/asA1n9lpGqfVmVlQ8wL6MxiU5xQCMCYL0X/ws37WK
-boMUWmxHyF8gxqd7t5hm1OrKpSG274PGgUZXpRjfLqdlNyLzUzXztvvY6xloCqaK
-tYcUfYDZD0SaINi8v7L9KF2ZCsi2uXsZOjBf30BrAoGAXPPotkw/CkcPQBS13cha
-ZWeeH5NDKBADWXfLfcRUs108c9xw4BYr5yGilSPscN2ZP0/iWONKp/c6/STS54t5
-lkOKKUbkAFbQu8UKa1J7zrnHZv+Mr4I/iBBy6VkN8Spp2vBI3Ng6jhPIJg3Gum9p
-943wWtAnIhe/UqCRT3a/GZg=
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDW1Fxio9eajvNg
+pfIHZL34LhZzRB5MWpYHCIiE0E0VgwyvZUxVQpYUgvgAZlsstXvnRKWqTmPh2YgF
+KoDC8k1w62Mkf/nZcBNTy0USDDwe0s4I+bngv41rDLkpmTGW+baw/eUU2ec7dyZc
+weNUx2PgozDehgYZD34E0tLT8HgjIXk8mkJBblM23twPx5iKhXkK1O+QAhsSOmAy
+bFTFin90JA7TCFvS5q7eF0ePTa4TAGdF5rwO7hsNRLIMJW24OFyHwdOYJ6FWIVxC
+FbP0t+yuva6v5FANNHw84bFk9uQHU52WRIpB4Dzf8vxt3vddjATK4U/MpcUMzqj3
+SbVjawJTAgMBAAECggEAZFozBcjvcD2SpvUdyCJhM0ukJRgO5y/xoTt1OkVrnL7o
+8A3ryHAgV1iOrPEjahEk3fWNRa70rY3GIlOmbmptjnAGkghOGCpofN4ZV8LrWqKy
+qDKvh7MzRmxdGnd7WMExfCA+IK1hfL+95dqUbQfvOgJBU9Fbi91Wyr4IygQsuouP
+Nog3FLz4jejr578qx310Nm0ppNWDa9vWWoiu4bW9u7mqYXhrOiLBxPp/EP2sg5+S
+yocjtHSfcrMDBOdiluFWlNyX69uKXWDyge/F9H5whuW5H4JRHv3i3sUcaXK/PF8D
+RwJCDiX4E7M7JVG1EgCz4kC0GyTNGihwSTB66DJxcQKBgQDyM+M71wiMQxseCCZa
+sBbRfNm100agUNRUBWGrmOLXj6eThkwNknndAZh4nUpuGOYO0CZrnfO4rUBAjpTx
+7++0OGJEf7CEX26da5Ge+ywkgxpOaVbhliuDeFZ3Lqy/1UcUVPvxPy27Sc6i6SYt
+gKaej3KpyJW0nUi2Fmca1mHp7QKBgQDjEUhYrMJrXLbmR6AELp7sbTTw1fFp2jUC
+iiM3lEYfuiUprOCXe6m2yWkd0mF2YyGZt7Z2LMX4jIRe06h4c7WSMuHAbb9Tvro9
+Kp7Xgq6+edKSdIQG8mb/UXauEuhqRyt2Y8Xr18yPlmpViI+xiAWT9x/9otpkxMVu
+RiUVEWoVPwKBgQDb2AtXgr0Ii9TucplV0eY0aq4247qExDmmtmfMWW72GTgTqWAZ
+Ja6l08/xE1y/CKyyH2/wWSQjqmba8lDyNkcO/+r6oCi6TuFZ1I0OkJCl57aWG/m3
+tBZ1NGLPtbcqPU5Sfz1c4msBSGJe72AvB0q2PCDpSd/RXL7mQPl/m76ulQKBgALx
+7HBJ/VOLJkwiTa8AM8t5NyCQhcsLq3hW9lH4OFic/3Jk7ZzJW9AlGJnsapswefUW
+buVle0PX/reEI0E8rvQweMEYK00Ywi2c6eZ9qWqLBfIkVLoKVs+k7NchI6aNOcEV
+VjHS4LJUDxkA5mw1CW173QxbGl4IN09Q1ZZKXYfdAoGATv50WfkAxn+wA3R8edUk
+ZIqqxoeh3isSN7XSQCypFIKGP0Cmo4cjcvgyXVGYX3b9a2LiNRags/q4S2ZGLz9C
+Ksv9uiyKA8THhcdx4RVUQuWEjyGzivwkk9UHTZhwOM+ED0HyE5/gnMs2RJVMMd7W
+0tocCTiUvCxfBB3W77Nm48g=
 -----END PRIVATE KEY-----
diff --git a/mysql-test/std_data/client-cert.pem b/mysql-test/std_data/client-cert.pem
index 9f6f0cfde7c..432784a543f 100644
--- a/mysql-test/std_data/client-cert.pem
+++ b/mysql-test/std_data/client-cert.pem
@@ -5,22 +5,22 @@ Certificate:
     Signature Algorithm: sha256WithRSAEncryption
         Issuer: CN=cacert, C=FI, ST=Helsinki, L=Helsinki, O=MariaDB
         Validity
-            Not Before: Apr 25 20:52:33 2017 GMT
-            Not After : Apr 20 20:52:33 2037 GMT
+            Not Before: Apr 24 14:29:50 2019 GMT
+            Not After : Apr 19 14:29:50 2039 GMT
         Subject: C=FI, ST=Helsinki, L=Helsinki, O=MariaDB, CN=client
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
                 Public-Key: (1024 bit)
                 Modulus:
-                    00:a1:10:ea:cc:8e:2c:73:6b:33:1a:5e:26:19:b6:
-                    4b:4c:bc:04:b8:c2:e2:33:eb:67:a2:7a:27:af:3f:
-                    f7:ef:49:5f:c1:d2:b9:d9:71:fe:17:a0:93:da:dc:
-                    f1:47:de:fa:1f:c3:c1:d1:a5:2a:06:cb:b3:e8:9a:
-                    c1:bd:78:77:68:45:c1:55:cd:b1:c1:d3:df:8c:12:
-                    4f:c2:3a:0d:b7:58:dc:ca:13:08:b9:fb:12:24:90:
-                    aa:b7:4e:04:eb:43:0d:45:be:1c:17:d6:a8:b1:af:
-                    10:3c:39:d6:08:45:ed:a9:7e:3a:69:ae:70:22:86:
-                    7e:71:1f:f1:0e:d0:0d:32:c3
+                    00:ab:9b:08:e8:ee:c3:21:9e:b5:dc:3e:03:b2:4e:
+                    d5:45:58:7f:dd:95:a1:d9:b1:86:c5:1b:c5:d6:66:
+                    52:73:2c:d4:eb:53:80:0c:02:1d:8b:40:43:b1:e9:
+                    db:a1:87:d7:61:f2:35:b0:4f:bf:1b:20:87:60:6f:
+                    4f:0a:df:8e:1b:32:fb:69:d3:be:24:20:77:be:cf:
+                    f6:4f:23:fc:2c:f4:12:a1:b9:54:7e:74:e2:21:7f:
+                    03:e5:03:a3:17:a6:eb:c5:1b:38:3f:35:9d:b9:67:
+                    73:d3:80:c5:61:f4:8d:48:2e:cf:f0:aa:59:36:7c:
+                    4f:f6:37:f4:b7:7d:fe:1d:87
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Basic Constraints: 
@@ -28,42 +28,42 @@ Certificate:
             Netscape Comment: 
                 OpenSSL Generated Certificate
             X509v3 Subject Key Identifier: 
-                0C:20:76:A1:80:9C:2F:30:3D:F7:AB:8D:31:19:AD:E2:F7:E2:8D:12
+                53:3C:D1:92:1E:19:3C:32:DA:BF:5E:2E:11:E8:17:A8:1C:77:27:DE
             X509v3 Authority Key Identifier: 
-                keyid:1C:C7:2B:AA:1B:B1:BB:2E:9A:F4:0F:B1:86:60:57:38:C2:41:05:12
+                keyid:F3:1D:A0:5F:69:33:8A:A4:B4:76:97:A2:6E:AB:FD:A0:BF:F3:2C:CE
 
     Signature Algorithm: sha256WithRSAEncryption
-         39:c0:90:13:19:85:47:9d:c6:ab:8c:c6:c9:0f:33:11:19:f7:
-         01:2c:1b:08:f6:81:98:11:ab:48:05:d9:b2:29:56:32:9c:ba:
-         e5:40:df:85:5e:6d:fd:6e:36:9a:14:eb:90:50:57:de:2f:ed:
-         2d:89:a6:8a:40:1c:41:84:9b:da:e1:6d:e6:7c:46:b2:e0:90:
-         93:02:1c:52:2e:af:b4:d4:a1:d8:9d:19:cf:0a:67:bf:c3:3e:
-         2e:02:f4:3e:bc:2e:59:57:30:85:8a:32:ab:22:88:72:37:6e:
-         ee:ed:f8:53:72:c9:28:87:50:47:81:1b:80:4c:f8:80:ce:2f:
-         47:ca:78:ce:38:51:70:ec:df:ee:fc:ea:5a:40:1e:4d:1c:fd:
-         4e:f6:74:d0:22:a4:7e:57:df:16:1a:a0:8d:be:fe:ee:f2:07:
-         2e:39:a1:97:40:19:f9:3b:b8:e7:c4:98:6e:1d:1a:27:d3:19:
-         4c:5c:c9:c3:31:98:c1:3c:27:0e:6a:de:cf:88:72:cf:e4:65:
-         c9:0d:33:32:f1:ea:f7:dd:5b:9d:42:6d:ee:c7:a8:b7:85:d2:
-         41:e0:84:38:ce:86:81:ba:6e:7d:d5:ad:7a:00:58:d7:c5:83:
-         9e:5c:1d:38:32:72:49:f5:42:4b:e7:c6:5c:12:6d:e1:5d:51:
-         2c:f5:52:f0
+         8d:f9:38:ab:6e:7b:b5:91:80:f0:51:8f:0c:67:b9:39:64:c1:
+         5e:e6:da:2b:f6:7c:8d:37:13:d4:47:a3:2f:be:04:53:da:b0:
+         dc:d1:35:88:ee:3f:52:be:17:ea:ae:ec:2b:cd:e3:cd:6b:8f:
+         09:e5:c2:aa:9b:50:aa:ea:63:ea:74:97:b5:ab:c9:27:6c:1d:
+         8a:80:a0:49:7b:0f:6e:77:92:6c:db:0c:a8:c0:5d:c3:6a:54:
+         24:52:6d:87:22:49:67:68:89:16:35:bc:eb:94:59:f7:2a:55:
+         dd:50:ca:ee:c8:72:4d:03:92:e3:10:46:d5:20:80:09:cd:db:
+         fd:c8:b2:de:4f:1f:c9:96:8f:d1:cf:81:99:d2:ab:b9:c5:27:
+         e0:40:e8:76:e9:a4:4d:c9:03:0b:be:d5:f1:f4:42:ce:2c:83:
+         6e:3e:80:bd:cb:59:36:4d:34:47:08:91:a8:e1:23:f5:e0:af:
+         89:ae:1a:74:3e:ea:82:19:07:ef:3c:d6:3f:cf:5c:75:5e:57:
+         c7:32:17:b1:16:36:7c:7b:a7:45:aa:de:e1:b8:c1:a2:05:1a:
+         e4:30:51:a3:af:9e:ac:a0:8a:fc:fd:9d:b3:a9:ae:25:62:91:
+         cb:ee:e7:bc:fc:9c:3c:e9:15:ee:a2:6f:f5:f1:fd:6e:59:a9:
+         41:0b:c6:7d
 -----BEGIN CERTIFICATE-----
 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
-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
+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
-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
+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
 -----END CERTIFICATE-----
diff --git a/mysql-test/std_data/client-key.pem b/mysql-test/std_data/client-key.pem
index b6b5507cd15..e5fcc82acb3 100644
--- a/mysql-test/std_data/client-key.pem
+++ b/mysql-test/std_data/client-key.pem
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQChEOrMjixzazMaXiYZtktMvAS4wuIz62eieievP/fvSV/B0rnZ
-cf4XoJPa3PFH3vofw8HRpSoGy7PomsG9eHdoRcFVzbHB09+MEk/COg23WNzKEwi5
-+xIkkKq3TgTrQw1FvhwX1qixrxA8OdYIRe2pfjpprnAihn5xH/EO0A0ywwIDAQAB
-AoGAaJMqT+vTcpDcmjcct78DPuwoiKmH4rvqCrUTRRbcbJGQSbD/F+6KUl7hAM5J
-Hifo8GzST8LT+ZuS0OiB9/naVGJjcLzpV+us+keMctB/cjmsPAAsRdeA8Xk0jTWv
-v+5a5ZWSSbRXycuUtywtoESY1RLEyB0k3Dcxvk6SD3LnNMkCQQDTyDJfP+eirhgC
-mKiNvHJjLtlRT11IMLMVTELEntsyKqzVgficZCWGkFRoF9iEO1OyCJaug7RZsuxs
-Z3lk/gq1AkEAwrHwzVPU+dTqsZ8tYHlq+d0xy+6eTtYy7e/5qH3AUz10us6BG/LY
-XVTwRFAOKQOciKZ/zPQa4oYeAc0oozSalwJBAIuMbyS0Rz262bdcQDSk5/rS8//P
-+/eFn3t5NMW6p1T3KcvGSLtEgjWZBQVSMSlwrkWxwxhbUIuKip8jz6nse8ECQDgm
-g5FkLRdEfc9uXfLl8aFQVu0+y29nPVb8D9+1LMOVBNZfekLqPdZlCcpZ4EuZ3ApZ
-IqCkgiB0l7DjT2YKZM8CQQCp8z1JvoNRwhIuojh7JajY5QBkXtvHootXr+vDUHNf
-SgR5BRmqZb0F5/BK4/7JbumiHI11QUULxhOnNtlS7DDt
+MIICXQIBAAKBgQCrmwjo7sMhnrXcPgOyTtVFWH/dlaHZsYbFG8XWZlJzLNTrU4AM
+Ah2LQEOx6duhh9dh8jWwT78bIIdgb08K344bMvtp074kIHe+z/ZPI/ws9BKhuVR+
+dOIhfwPlA6MXpuvFGzg/NZ25Z3PTgMVh9I1ILs/wqlk2fE/2N/S3ff4dhwIDAQAB
+AoGAdDsE9OhLKGlcGjmyvUHh+B8yM/5WaqFwe+8Mt+QEMliKOn4K+5cvNZMohsez
+6BufCYtJTAsnkJMevnWF3wJ+N9ceuFmYP0iiliKaC6pfrytSSO7XBcluGawHTJl6
+xwG2BonBgAUGClAQY6yeA3QAkos9Cwl2yBOSsOBFp0BCTxkCQQDjHpEb+TRPNeS9
+9dtrl+00n8XV8E8BZrcPdb7bCllhPrxmLD9T3ZgDiya5ZelzRCpySRQfqVV4sVO1
+UnAn0w29AkEAwW1S15bXHgCFutLlOlAc09PK39JbtLijxEaIwAMdyR8i8v9zkB8M
+/bjARB/6sY6Pwr8ISewnkWVdLWLNSTTCkwJATAbFaGnJOuK9iWEtbBzVSJJbNTxW
+Fg/+I2y00LnsJYNMqZ8SK863vifsdI9K0Ez3MH6J//c9J0Ok08Oey5X4uQJBAKhE
+JnEN841R/wQLOwaDctCDylTzdnu8tBqnEYeYLm0r/QdPWoThvjdqZTfeagPUdROB
+hABqw/EkMO6uqM8qaqkCQQCPQ2Nz10wnsMY2wNs6gnHkqQX+ociiOVWrp6lwWx+K
+NTZg1FIkLEWFfH+meTguOSso/IXt+HlWb6sHth00OeJi
 -----END RSA PRIVATE KEY-----
diff --git a/mysql-test/std_data/server-cert.pem b/mysql-test/std_data/server-cert.pem
index b874f129ce3..9f735d99e36 100644
--- a/mysql-test/std_data/server-cert.pem
+++ b/mysql-test/std_data/server-cert.pem
@@ -5,22 +5,22 @@ Certificate:
     Signature Algorithm: sha256WithRSAEncryption
         Issuer: CN=cacert, C=FI, ST=Helsinki, L=Helsinki, O=MariaDB
         Validity
-            Not Before: Apr 25 20:52:21 2017 GMT
-            Not After : Apr 20 20:52:21 2037 GMT
+            Not Before: Apr 24 14:29:39 2019 GMT
+            Not After : Apr 19 14:29:39 2039 GMT
         Subject: C=FI, ST=state or province within country, in other certificates in this file it is the same as L, L=location, usually an address but often ambiguously used, O=organization name, typically a company name, OU=organizational unit name, a division name within an organization, CN=localhost
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
                 Public-Key: (1024 bit)
                 Modulus:
-                    00:c9:fe:83:3f:0b:38:89:1d:43:15:93:5c:26:b9:
-                    80:65:41:bd:2f:63:66:5e:db:fa:33:20:d9:c7:e1:
-                    35:f3:14:3c:c8:b4:f7:09:d8:f5:b5:44:8f:6b:7e:
-                    a0:a4:3b:45:5f:e6:f4:0f:08:67:f8:5a:4c:49:e4:
-                    e5:39:31:69:8c:cf:25:78:93:a6:7f:58:e9:90:9c:
-                    61:cb:2e:14:b1:57:b2:15:9c:ea:8d:6f:96:20:fe:
-                    29:ed:2c:71:b8:4f:1f:e0:05:6c:04:b1:7e:e0:bc:
-                    42:8e:bf:95:5e:a9:5e:c9:c9:a4:64:c2:1f:59:94:
-                    14:c2:06:44:79:bc:d2:65:2d
+                    00:b6:42:a0:5e:1e:05:5e:7f:15:bf:7c:a4:d6:c7:
+                    a8:cd:cc:db:f4:c4:e5:6d:f3:53:47:90:7b:d2:d6:
+                    d9:0d:45:7c:62:aa:81:64:3d:b8:db:29:1f:0c:af:
+                    35:69:d3:82:7a:66:86:7b:97:ce:0f:54:a1:7c:ae:
+                    97:0c:0b:7a:1e:cc:60:bb:c5:bb:a1:47:d3:c8:22:
+                    a0:79:11:2c:09:85:f2:2d:be:24:5a:73:88:d8:45:
+                    bc:6d:d2:9e:7b:8d:9d:55:f2:c1:1e:e6:cd:20:a0:
+                    8b:b4:3b:85:0c:4b:06:b3:d5:1e:51:1f:a5:ea:fc:
+                    81:74:c6:bd:59:f8:81:35:05
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Basic Constraints: 
@@ -28,47 +28,47 @@ Certificate:
             Netscape Comment: 
                 OpenSSL Generated Certificate
             X509v3 Subject Key Identifier: 
-                CB:22:3B:E6:DA:B8:3D:7E:39:61:18:38:50:C8:4D:B4:C8:9A:3E:2B
+                2E:E9:8D:DA:55:FE:77:34:F0:0F:F0:07:02:31:7C:7D:DE:D4:0C:D5
             X509v3 Authority Key Identifier: 
-                keyid:1C:C7:2B:AA:1B:B1:BB:2E:9A:F4:0F:B1:86:60:57:38:C2:41:05:12
+                keyid:F3:1D:A0:5F:69:33:8A:A4:B4:76:97:A2:6E:AB:FD:A0:BF:F3:2C:CE
 
     Signature Algorithm: sha256WithRSAEncryption
-         8e:b7:3d:cc:2b:e5:27:49:49:5a:d4:3c:83:9b:2f:7d:11:de:
-         6b:0f:b4:51:02:e4:37:d0:c4:b5:7b:4b:e3:42:93:75:32:d1:
-         eb:41:a2:27:fe:4d:91:ae:2b:a0:8b:3b:7f:e9:1b:47:85:73:
-         9f:b7:05:74:34:eb:62:12:d8:f2:24:6a:b4:24:58:7a:6a:55:
-         3e:ba:54:f9:51:de:54:0e:19:06:f6:01:23:32:0a:6c:81:e2:
-         57:8a:9e:71:c5:ba:ca:c3:0f:18:d4:ef:54:4b:e1:ee:7c:3a:
-         f3:4d:c3:a3:44:21:9f:c8:ef:85:01:ab:fe:a9:7b:36:05:10:
-         25:5e:61:b8:1d:7c:40:8a:5d:5b:c1:bb:7c:79:45:6e:84:63:
-         b5:3f:51:e9:9c:57:01:de:2d:1e:85:cb:83:f0:16:6d:78:bb:
-         12:01:a5:e5:a2:a7:80:fa:54:8f:9a:5c:de:1c:52:a2:bd:00:
-         49:e4:04:65:30:f9:b9:fc:4f:94:e2:d8:39:89:b6:a5:a5:2d:
-         db:25:a3:0d:5b:f9:e1:2a:13:19:5e:d7:1a:33:89:5b:ac:bd:
-         29:26:da:1a:90:7e:08:19:dd:59:4b:50:fd:46:c3:0b:91:33:
-         8b:c6:70:d1:22:18:37:a3:8b:d3:8f:f8:68:cf:38:8e:e1:ef:
-         ac:17:88:ca
+         8e:80:73:98:21:69:44:9a:75:e9:08:ec:53:fa:48:84:6b:36:
+         66:d6:84:0d:1c:d0:89:c8:9e:59:0b:33:64:2d:92:ee:a3:f1:
+         c9:a4:5f:52:5f:b3:39:d9:36:9a:0d:9b:44:79:72:27:81:06:
+         8b:bb:b7:ec:f2:d4:23:ca:03:0b:19:44:c5:64:9a:0e:e9:b5:
+         4a:db:bb:7a:47:65:5f:be:00:25:0b:67:42:ad:3a:89:ba:e7:
+         97:c1:88:dd:22:49:57:21:3d:fe:c3:e8:ab:70:6c:d1:a3:7d:
+         3e:ac:8f:d5:a7:df:4e:5a:de:7b:71:60:16:a8:5c:c8:3b:9a:
+         f9:86:92:27:ae:9b:73:fb:0f:f0:09:d0:9d:f0:2a:df:54:86:
+         44:b5:29:af:93:d3:03:fa:48:72:44:69:85:d3:9f:d5:7f:5c:
+         4c:30:af:e7:37:0b:db:29:74:fe:d2:49:ce:90:fb:af:a5:39:
+         a6:98:83:c6:51:63:e3:3e:bf:b1:9b:8b:26:bd:34:69:cc:d4:
+         2c:6e:6c:2d:90:01:9b:3c:4c:9d:cc:4f:f4:86:2a:44:92:2e:
+         ab:ac:eb:e0:55:6d:50:cf:0d:52:ac:d5:3f:3e:36:4e:21:61:
+         ee:2f:40:a2:52:be:42:f6:81:aa:c3:9f:4a:6c:68:02:1c:8b:
+         63:e1:ec:8e
 -----BEGIN CERTIFICATE-----
 MIIEETCCAvmgAwIBAgIBATANBgkqhkiG9w0BAQsFADBWMQ8wDQYDVQQDDAZjYWNl
 cnQxCzAJBgNVBAYTAkZJMREwDwYDVQQIDAhIZWxzaW5raTERMA8GA1UEBwwISGVs
-c2lua2kxEDAOBgNVBAoMB01hcmlhREIwHhcNMTcwNDI1MjA1MjIxWhcNMzcwNDIw
-MjA1MjIxWjCCAUcxCzAJBgNVBAYTAkZJMWEwXwYDVQQIDFhzdGF0ZSBvciBwcm92
+c2lua2kxEDAOBgNVBAoMB01hcmlhREIwHhcNMTkwNDI0MTQyOTM5WhcNMzkwNDE5
+MTQyOTM5WjCCAUcxCzAJBgNVBAYTAkZJMWEwXwYDVQQIDFhzdGF0ZSBvciBwcm92
 aW5jZSB3aXRoaW4gY291bnRyeSwgaW4gb3RoZXIgY2VydGlmaWNhdGVzIGluIHRo
 aXMgZmlsZSBpdCBpcyB0aGUgc2FtZSBhcyBMMUAwPgYDVQQHDDdsb2NhdGlvbiwg
 dXN1YWxseSBhbiBhZGRyZXNzIGJ1dCBvZnRlbiBhbWJpZ3VvdXNseSB1c2VkMTQw
 MgYDVQQKDCtvcmdhbml6YXRpb24gbmFtZSwgdHlwaWNhbGx5IGEgY29tcGFueSBu
 YW1lMUkwRwYDVQQLDEBvcmdhbml6YXRpb25hbCB1bml0IG5hbWUsIGEgZGl2aXNp
 b24gbmFtZSB3aXRoaW4gYW4gb3JnYW5pemF0aW9uMRIwEAYDVQQDDAlsb2NhbGhv
-c3QwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMn+gz8LOIkdQxWTXCa5gGVB
-vS9jZl7b+jMg2cfhNfMUPMi09wnY9bVEj2t+oKQ7RV/m9A8IZ/haTEnk5TkxaYzP
-JXiTpn9Y6ZCcYcsuFLFXshWc6o1vliD+Ke0scbhPH+AFbASxfuC8Qo6/lV6pXsnJ
-pGTCH1mUFMIGRHm80mUtAgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgEN
-BB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBTLIjvm
-2rg9fjlhGDhQyE20yJo+KzAfBgNVHSMEGDAWgBQcxyuqG7G7Lpr0D7GGYFc4wkEF
-EjANBgkqhkiG9w0BAQsFAAOCAQEAjrc9zCvlJ0lJWtQ8g5svfRHeaw+0UQLkN9DE
-tXtL40KTdTLR60GiJ/5Nka4roIs7f+kbR4Vzn7cFdDTrYhLY8iRqtCRYempVPrpU
-+VHeVA4ZBvYBIzIKbIHiV4qeccW6ysMPGNTvVEvh7nw6803Do0Qhn8jvhQGr/ql7
-NgUQJV5huB18QIpdW8G7fHlFboRjtT9R6ZxXAd4tHoXLg/AWbXi7EgGl5aKngPpU
-j5pc3hxSor0ASeQEZTD5ufxPlOLYOYm2paUt2yWjDVv54SoTGV7XGjOJW6y9KSba
-GpB+CBndWUtQ/UbDC5Ezi8Zw0SIYN6OL04/4aM84juHvrBeIyg==
+c3QwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALZCoF4eBV5/Fb98pNbHqM3M
+2/TE5W3zU0eQe9LW2Q1FfGKqgWQ9uNspHwyvNWnTgnpmhnuXzg9UoXyulwwLeh7M
+YLvFu6FH08gioHkRLAmF8i2+JFpziNhFvG3SnnuNnVXywR7mzSCgi7Q7hQxLBrPV
+HlEfper8gXTGvVn4gTUFAgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgEN
+BB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBQu6Y3a
+Vf53NPAP8AcCMXx93tQM1TAfBgNVHSMEGDAWgBTzHaBfaTOKpLR2l6Juq/2gv/Ms
+zjANBgkqhkiG9w0BAQsFAAOCAQEAjoBzmCFpRJp16QjsU/pIhGs2ZtaEDRzQicie
+WQszZC2S7qPxyaRfUl+zOdk2mg2bRHlyJ4EGi7u37PLUI8oDCxlExWSaDum1Stu7
+ekdlX74AJQtnQq06ibrnl8GI3SJJVyE9/sPoq3Bs0aN9PqyP1affTlree3FgFqhc
+yDua+YaSJ66bc/sP8AnQnfAq31SGRLUpr5PTA/pIckRphdOf1X9cTDCv5zcL2yl0
+/tJJzpD7r6U5ppiDxlFj4z6/sZuLJr00aczULG5sLZABmzxMncxP9IYqRJIuq6zr
+4FVtUM8NUqzVPz42TiFh7i9AolK+QvaBqsOfSmxoAhyLY+Hsjg==
 -----END CERTIFICATE-----
diff --git a/mysql-test/std_data/server-key.pem b/mysql-test/std_data/server-key.pem
index feb7fbaf535..26d171dcde4 100644
--- a/mysql-test/std_data/server-key.pem
+++ b/mysql-test/std_data/server-key.pem
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQDJ/oM/CziJHUMVk1wmuYBlQb0vY2Ze2/ozINnH4TXzFDzItPcJ
-2PW1RI9rfqCkO0Vf5vQPCGf4WkxJ5OU5MWmMzyV4k6Z/WOmQnGHLLhSxV7IVnOqN
-b5Yg/intLHG4Tx/gBWwEsX7gvEKOv5VeqV7JyaRkwh9ZlBTCBkR5vNJlLQIDAQAB
-AoGAZzoeMJW3arr9kYUhTtj1+MlDuXf+1PNuRbrAERnSzErHVXrF1M5/owdKlBC+
-X6+6oGwSxavyFkVvP0QusK/D1DxSs60Mk1p3Ax5nVpNYiBdeBULcYiXCSUbKItYL
-vzyECIc02t+auWf/wp3Wy3g6sU6FoT2QCPSsy0qRC48VBzECQQD79P9w0XjJGk8y
-3zPc4JOr3a1UUu4VLjFdFDR2eZZRE02NcXfLHE0+Idk3TYnNDRLoWDJjdfZ0thZZ
-KuJ58wIDAkEAzTxGYmT/aieDC3G8sHMqLUvjN30TfTocv7mWlpxWo7zbRbQm7jsB
-S5weRKtu3yVmdb6rW+5IZSCazc/j4T5tDwJAUgDRSpTCrSFE+Zevt4nYRi2mBjXf
-i0E3i8XRtWWpSMXxjcGKba7ObRRzMA6qdPR2XOynqbtw9Vd2Ops8jthKpQJBAJJm
-8tZxsXlqIiLhyXYdUPLq9XS5tlNYRvXFT9S0RWGb8NbyQesjEDN9dGIL4JUxurs3
-fkmf2ui4r3UtXSNqQqUCQQDjatAhBdibh5UawO5VpI87OJMzATCkY/mX3R+TnbOm
-MkdydjF022P0M4N24DiM+2nBTDp+F45LwtQLa4vmB2No
+MIICWwIBAAKBgQC2QqBeHgVefxW/fKTWx6jNzNv0xOVt81NHkHvS1tkNRXxiqoFk
+PbjbKR8MrzVp04J6ZoZ7l84PVKF8rpcMC3oezGC7xbuhR9PIIqB5ESwJhfItviRa
+c4jYRbxt0p57jZ1V8sEe5s0goIu0O4UMSwaz1R5RH6Xq/IF0xr1Z+IE1BQIDAQAB
+AoGAdQJNJl8rn0EDW03QHbtMmeL9CyUlDfN68aTGedNIwYZsloNUUmB1vu2la2VI
+a0pIqAAOMmaA+cKhcgQ8IJV1rh11BgiRhwJZJNRY1EYik5rEgJCYivlQo3PiDUhR
+6l3t4xEmSswXyOj9WCo8kKJdjalERNDavLhXHa/SnQnSpzkCQQDtreVj+DIzRcJp
+IaZvIlnVeDb+ZB3903DzXJLT4cqwmi2TuVBT6RkE4lnYAAIfQxedMfayLKzHTvse
+aP4vvvRfAkEAxE8m27MngLZUyje9WwnbtXDUOALBNnGz3KE+qD6UN+a8qCJAJSJ5
+oJBpZU3ZDRKZaiIUOtQsMOonjB6wFrDxGwJANRnu8CDZhl8Filt8RcQU8f6Dut4/
+XSBKUfTS0QfXMxGfMSvr6HNhpZe0nu+Ric6BjhtFlJUqnPTmYervL1eoXQJAChm4
+eh1hrvGysyTjDUgYkeFYSfl6T37SLkvtmWJ+5dFta4k3m7GGaIiFo7y5qj6Gvjs6
+pzw7edjSaBc8IC7CeQJADBoy86mlLSUi7OzNz7xp3f2E1HUmjARFP72PW3FAosoU
+GCsVCFeBZDSREZoQHB4CQZhjLFYkbBeVwFVOW/Jxjg==
 -----END RSA PRIVATE KEY-----
diff --git a/mysql-test/std_data/server8k-cert.pem b/mysql-test/std_data/server8k-cert.pem
index df27c77e8e0..187ea9a1b28 100644
--- a/mysql-test/std_data/server8k-cert.pem
+++ b/mysql-test/std_data/server8k-cert.pem
@@ -5,82 +5,82 @@ Certificate:
     Signature Algorithm: sha256WithRSAEncryption
         Issuer: CN=cacert, C=FI, ST=Helsinki, L=Helsinki, O=MariaDB
         Validity
-            Not Before: Apr 25 20:52:33 2017 GMT
-            Not After : Apr 20 20:52:33 2037 GMT
+            Not Before: Apr 24 14:29:50 2019 GMT
+            Not After : Apr 19 14:29:50 2039 GMT
         Subject: C=FI, ST=Helsinki, L=Helsinki, O=MariaDB, CN=server8k
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
                 Public-Key: (8192 bit)
                 Modulus:
-                    00:b3:a7:81:cf:a3:9b:3c:57:2a:8e:de:13:08:a6:
-                    15:6a:68:08:ce:a1:a0:ef:fc:32:95:5a:9a:b5:cc:
-                    84:bb:a3:15:a0:fc:29:bb:71:0e:f3:40:20:97:35:
-                    92:92:89:36:6a:5f:be:a5:24:5a:c8:0e:f7:53:a8:
-                    e0:74:05:90:38:21:a5:25:72:2b:56:70:74:aa:d6:
-                    30:25:e0:95:dd:3d:4a:48:4b:25:a7:a8:c4:eb:e5:
-                    d6:10:4f:95:42:91:b0:cb:68:2f:bf:96:0f:0a:9b:
-                    2b:01:0d:03:ae:3f:b7:7e:f6:1e:c1:14:42:04:7f:
-                    09:21:e8:3e:87:c0:b3:d7:dd:4f:7e:95:b6:83:33:
-                    8f:cc:f4:bb:11:8e:66:5f:b4:32:22:8b:8e:34:93:
-                    82:0f:02:d1:6f:85:b2:a7:7e:36:0c:f3:0d:91:46:
-                    f9:a5:91:dc:60:4a:0d:eb:e5:37:e3:76:d8:13:bb:
-                    55:33:23:4c:b3:90:df:6a:b6:80:3d:f6:bd:9d:bd:
-                    ef:d3:8d:7a:9a:61:ac:02:3d:10:b5:c2:53:d2:7e:
-                    ee:1c:90:a5:b0:e8:db:71:8f:d3:53:e4:80:b0:b6:
-                    cc:b0:f2:eb:46:c3:d9:3c:48:01:1d:3a:5c:d0:f2:
-                    17:9c:9a:8e:fc:2a:36:e7:1c:59:41:66:ad:e1:d3:
-                    82:d8:95:ee:ae:dc:ab:72:94:cb:0b:8a:df:ef:70:
-                    f7:f9:e2:77:76:64:67:2d:02:dc:1a:db:02:e9:5e:
-                    63:3f:3e:07:e9:65:e4:02:78:62:55:e1:52:18:5a:
-                    a3:9c:56:dd:cd:d3:f7:f2:55:45:62:20:ce:fd:41:
-                    93:b9:c2:20:90:23:a4:41:4f:30:5c:5e:a0:97:6f:
-                    a4:1f:87:6a:97:87:70:f9:d5:56:b7:6a:cc:f1:28:
-                    d2:26:34:57:65:9c:2d:41:43:8b:6c:bd:15:6f:ec:
-                    ce:3e:9f:4d:2f:a6:21:d8:f7:4d:d1:63:4f:f0:9e:
-                    04:c3:82:33:58:34:20:4b:81:0d:42:0d:44:62:48:
-                    1b:4c:cf:e0:69:e4:c8:f8:9c:98:1f:74:37:3a:3f:
-                    23:40:3a:88:80:c2:9c:9b:ba:6a:b9:2c:3a:67:a6:
-                    b6:5c:83:fd:93:3f:6e:53:19:48:e3:3d:fa:f5:8e:
-                    03:40:8f:e6:af:c5:de:aa:f8:70:77:36:2b:6e:3a:
-                    df:bc:d7:f6:c7:4f:02:7f:a1:ad:2f:3c:e9:08:45:
-                    2f:57:1a:f1:5b:9c:27:07:3a:44:43:3e:05:b1:4a:
-                    1b:42:a4:90:ab:ce:4b:f7:c1:9b:d7:dd:6f:05:11:
-                    f9:e8:a3:a1:99:6c:2e:27:3d:b1:54:6f:eb:b2:e8:
-                    f8:e6:12:6f:8a:69:05:cc:c6:f6:c4:2d:b0:06:b6:
-                    21:50:28:50:dc:8c:b2:8c:65:ce:d9:2b:51:b8:62:
-                    56:70:b4:46:4d:e4:4c:a1:86:31:3d:e3:07:7f:73:
-                    e3:09:6e:ee:a7:29:2a:80:23:8a:b6:0c:22:9e:43:
-                    1c:a9:8c:47:2c:02:6d:13:ef:88:a7:d7:d1:60:d9:
-                    6b:28:80:97:8a:b7:ff:62:6b:28:54:0d:ab:63:3a:
-                    ac:57:9e:2f:95:2b:f4:a0:3d:a1:60:a0:57:1a:09:
-                    23:ee:fc:4d:9b:45:83:f2:0a:1f:b3:77:0e:98:20:
-                    b3:16:fc:97:03:30:fc:ab:3e:7e:fc:3e:76:64:cb:
-                    4b:4d:c9:6c:8f:aa:70:ec:03:c5:81:31:43:11:9a:
-                    fc:2d:ba:25:94:0b:73:7e:c1:39:01:ca:68:70:1a:
-                    ef:a4:ba:dc:13:d6:37:17:09:0d:ca:aa:21:94:bb:
-                    3e:43:fd:8c:80:e6:58:fd:75:23:5a:ca:1f:0b:2e:
-                    35:c2:cd:77:0c:73:b3:2f:9a:e4:03:68:58:c8:3f:
-                    f3:76:8d:05:53:d2:34:db:09:af:70:ed:67:0b:ff:
-                    2f:64:35:2d:71:22:7a:f2:f2:2b:7d:6d:be:80:bd:
-                    18:38:37:01:67:a4:5f:48:29:52:78:9f:b5:b8:80:
-                    70:ca:10:6a:e1:27:3b:c0:61:4e:96:f8:e8:0f:42:
-                    b1:fa:bc:05:ef:31:91:38:ab:0f:a7:ef:2c:86:c1:
-                    ab:85:36:7c:10:9d:c7:0a:6b:e6:2b:11:dd:fa:45:
-                    e7:d2:c3:3a:c1:cd:60:27:68:26:d7:87:49:5f:e3:
-                    7f:26:20:1f:99:a8:f9:00:a6:0d:d5:13:81:6e:fc:
-                    27:8a:03:58:6b:0e:3a:c7:20:a1:5c:24:d1:08:a6:
-                    5a:1e:e7:81:3d:21:05:2e:4b:5d:18:14:f1:4f:ab:
-                    5c:e5:81:da:c1:2c:f6:12:ff:25:09:97:1e:9d:51:
-                    6d:1f:63:2e:9c:ed:7d:86:45:b0:35:73:f6:9f:82:
-                    65:bc:7f:46:88:e1:a1:60:a1:37:50:26:9c:d7:76:
-                    f3:dc:94:89:6d:d7:be:a6:17:a1:2b:71:14:37:17:
-                    5f:ed:5a:39:99:fc:69:af:bb:63:55:c6:60:7b:64:
-                    d8:bb:b7:4a:9f:b9:aa:89:4b:30:1f:9c:ef:23:7a:
-                    af:7e:31:dd:fb:dd:0a:d5:04:0a:8c:57:6f:64:80:
-                    eb:f3:ee:6c:33:d2:72:c2:24:68:a2:4e:99:88:1c:
-                    f7:3b:5d:10:cc:4e:ea:a5:cb:00:40:8a:a9:63:2e:
-                    18:92:eb:b1:28:05:fe:19:ea:7b:32:fb:63:56:2c:
-                    0b:20:01:92:a3
+                    00:cd:66:a2:70:48:a6:7b:2e:ef:40:10:f0:09:9f:
+                    0e:e8:f3:3b:43:07:2d:39:b7:54:55:aa:d9:16:12:
+                    81:18:8c:12:9a:ce:f1:5c:9a:f5:5d:96:09:3a:13:
+                    ee:b4:e5:a9:88:10:99:d9:7a:d7:c6:d6:6a:7e:26:
+                    c5:1f:63:83:bc:09:1a:1c:eb:f1:0b:9e:dd:cd:34:
+                    86:06:4c:83:aa:c9:45:5a:bd:2d:a2:ae:95:c7:4f:
+                    97:99:f4:80:bf:7e:38:67:9d:cf:94:12:e4:e9:6b:
+                    00:62:3d:b0:c3:c4:c3:94:62:e8:c5:7e:54:4e:8e:
+                    a0:d9:ad:8f:18:66:43:93:aa:66:c7:f3:cb:4b:47:
+                    2c:a0:94:99:18:40:ed:82:53:15:aa:cb:66:56:27:
+                    ed:78:8c:ed:f3:05:88:6b:dc:2e:d1:19:f7:ae:4a:
+                    d4:8d:55:81:99:ec:46:c2:2c:db:9a:20:a1:3d:fa:
+                    54:a8:a5:fb:66:dd:a4:09:ee:d2:5a:d2:f9:5d:07:
+                    4b:2f:7b:2f:e8:ad:97:db:52:59:41:28:a5:90:a8:
+                    d2:63:e9:ba:e6:a2:98:d7:7a:04:b2:63:1d:3c:09:
+                    e9:4c:af:b9:1c:c0:3c:4c:4a:55:87:9e:a7:16:8a:
+                    0c:6b:56:86:0f:d4:32:6e:41:05:89:12:55:45:33:
+                    57:de:49:38:4e:36:3f:dc:db:95:b0:13:da:4b:96:
+                    a1:d3:15:eb:80:99:5f:e9:d4:9f:2f:ba:82:ff:1e:
+                    9e:00:a8:5b:63:a7:12:49:ff:25:d5:b0:76:32:e2:
+                    04:01:21:5d:c8:2a:13:0f:f2:82:8f:f0:cd:ca:4f:
+                    01:5a:a1:9f:87:21:b3:33:ac:0d:0e:83:d8:3f:f7:
+                    db:9f:9d:f6:ba:c1:54:38:fe:c9:ac:59:47:93:51:
+                    bd:a8:3d:35:3f:e5:85:4e:f1:8b:06:72:94:3a:ae:
+                    ad:bf:32:cc:19:e3:c6:d7:3a:76:1e:5a:2d:10:cb:
+                    67:f0:bc:86:fc:0c:89:5c:7d:c4:2b:61:79:8c:82:
+                    ea:a9:84:55:a2:fd:1f:ab:11:a0:fa:b3:24:eb:b1:
+                    2d:f6:30:54:19:f5:71:a1:34:c6:37:20:29:32:56:
+                    97:29:40:63:5c:a7:fc:8e:67:98:8f:92:ec:49:06:
+                    06:fb:68:9d:d6:1c:9e:20:da:9d:74:21:8c:e7:0b:
+                    81:7a:ac:2e:fd:a0:8c:77:e9:6a:b2:20:7d:78:b8:
+                    ce:7a:bb:4c:8c:74:14:07:1f:5d:e8:91:6f:26:c4:
+                    56:ce:fc:9f:03:59:85:b9:5e:93:b9:1b:35:ab:ca:
+                    3d:c2:06:b6:ad:69:e3:5e:38:86:66:cc:e6:9e:64:
+                    f5:11:77:bc:7d:7f:9c:0e:fe:01:a5:dd:86:b2:84:
+                    ae:f6:6c:ce:3d:21:1a:9a:8b:a4:fe:91:ab:ea:18:
+                    4e:e0:fa:f8:8a:53:a5:b0:45:30:b0:c2:60:ce:e0:
+                    3e:f5:6f:17:15:df:a6:15:04:4d:34:92:e0:88:6d:
+                    ee:a2:f4:c3:7c:fd:a4:79:35:d3:44:c5:a4:98:14:
+                    a5:a4:2e:5f:64:e0:b7:4f:da:b1:22:6a:2e:6b:40:
+                    96:8d:4f:92:ad:55:36:a0:fe:bc:79:26:25:5c:65:
+                    27:36:5b:40:ef:b0:e8:ab:62:1f:9f:7e:a7:47:ee:
+                    32:37:fc:00:7e:9c:03:76:82:fd:7b:76:98:58:d1:
+                    a8:ed:b1:a1:99:09:92:0c:97:d8:92:7e:75:bf:3b:
+                    d5:c3:04:0f:b5:3e:86:64:bf:5a:51:9a:58:09:ae:
+                    77:bf:e9:66:2b:89:f6:aa:72:af:d6:ce:31:b3:20:
+                    6b:96:32:35:d0:0e:bf:a9:94:c6:b1:c4:3e:fa:24:
+                    ed:19:17:47:75:23:df:7d:02:a0:e9:93:99:37:1c:
+                    bc:9f:d9:b9:61:99:dd:c6:bf:74:2f:a3:48:61:89:
+                    8c:36:ab:bb:7a:3c:5e:95:a1:83:55:f9:6c:72:d9:
+                    69:7a:4b:c2:66:95:de:28:45:c8:26:f1:1e:59:3a:
+                    0d:af:da:f0:eb:fd:c4:e1:e8:68:c7:62:8d:16:f3:
+                    73:41:7b:65:97:b6:b2:de:ae:07:f5:e2:98:f6:75:
+                    01:b3:98:28:fa:08:11:22:df:cb:c4:2c:c3:3c:09:
+                    93:6f:4a:d9:6e:cd:42:23:a7:96:04:d8:40:73:fd:
+                    9d:09:33:6b:38:45:9e:fb:c3:f8:9b:54:1b:f9:f8:
+                    76:63:0a:47:d9:54:20:97:c2:3a:65:5f:a6:f5:36:
+                    1e:3a:f6:ff:6a:5b:e1:44:b0:17:9b:3f:49:5a:3b:
+                    c7:87:26:37:fa:0e:66:50:b8:c0:39:8b:b2:88:3e:
+                    8b:3e:c6:11:8a:c9:09:96:66:f6:b0:d8:d0:71:35:
+                    19:c3:61:7c:7e:2b:a5:d0:2d:0d:0e:ea:04:dc:94:
+                    f0:f0:6f:0b:ff:00:99:f7:fc:46:27:38:40:b7:26:
+                    75:ff:ba:fd:d0:f5:83:52:bb:9a:64:77:7f:5f:1e:
+                    15:8e:86:89:14:c6:ab:dc:a8:1b:f9:1e:dc:55:11:
+                    cc:28:6a:1c:ef:92:42:3b:38:c2:55:19:da:db:46:
+                    70:d7:17:6a:66:7e:ba:44:3d:38:4f:9c:9d:fa:87:
+                    20:a1:cb:86:87:62:ce:c5:3d:ac:d7:78:b1:93:38:
+                    ee:a4:be:04:61:ca:ae:01:91:8f:c8:14:3c:79:61:
+                    d6:81:f3:e6:47
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Basic Constraints: 
@@ -88,61 +88,61 @@ Certificate:
             Netscape Comment: 
                 OpenSSL Generated Certificate
             X509v3 Subject Key Identifier: 
-                43:3B:26:15:A5:60:62:3F:07:2A:8C:8C:DA:F8:74:BE:36:B2:33:E4
+                B9:0C:F0:60:22:D4:C5:BA:28:88:C5:5F:31:E0:A6:29:CC:E0:15:E6
             X509v3 Authority Key Identifier: 
-                keyid:1C:C7:2B:AA:1B:B1:BB:2E:9A:F4:0F:B1:86:60:57:38:C2:41:05:12
+                keyid:F3:1D:A0:5F:69:33:8A:A4:B4:76:97:A2:6E:AB:FD:A0:BF:F3:2C:CE
 
     Signature Algorithm: sha256WithRSAEncryption
-         5c:c7:4e:56:eb:21:1b:f3:5d:c4:56:fa:bf:6d:e1:0d:fa:cc:
-         b0:7c:13:58:b9:d4:47:b3:de:b4:ae:f2:45:02:88:65:43:89:
-         cf:ea:9c:d0:ea:45:42:35:d2:ec:bc:b4:73:03:db:85:7b:c7:
-         f0:68:d7:dc:2b:70:71:63:ed:33:68:9f:29:ff:67:0a:69:3b:
-         c4:65:7c:25:00:cf:7f:ee:aa:fe:44:19:70:f2:74:db:da:9f:
-         52:92:1a:03:e6:0a:49:85:2e:2a:02:c1:81:d4:6d:cf:98:d1:
-         e9:6a:2f:bb:fa:a6:d5:4b:55:38:c2:aa:8c:f5:d3:f9:e6:74:
-         db:00:d6:29:f9:d1:9c:7a:0e:98:c5:e5:8c:16:49:d8:cf:ee:
-         a0:cb:c2:2c:31:cf:62:2c:b1:7f:6d:60:b0:ce:d5:07:45:e8:
-         44:17:7c:c4:12:fb:00:57:24:57:e8:17:78:3b:1e:0d:91:aa:
-         67:98:d0:e5:9a:86:4b:88:4a:2f:55:5d:2e:13:ec:f5:4a:7d:
-         e7:13:a7:57:03:41:2f:f6:6c:08:8e:58:ef:b0:7a:79:32:e3:
-         bb:4b:eb:4d:42:cd:42:96:2d:67:f6:4c:c1:f6:62:fb:c0:3e:
-         09:69:8f:36:7e:fa:c8:cd:ff:72:3e:df:92:f7:8f:44:cf:77:
-         fe:6e:74:de
+         3d:c1:30:c0:a6:91:10:7b:3a:d6:d9:2e:e2:9c:23:03:48:88:
+         72:3a:9e:02:4d:cd:fe:b6:f7:14:77:1f:0f:98:94:3f:ed:90:
+         7e:64:0d:2d:d4:4d:78:dd:8f:10:8b:15:d0:65:5e:18:68:ea:
+         7c:be:f5:3a:84:e5:23:aa:e1:d0:15:61:20:3c:5c:06:0a:33:
+         e2:39:a6:11:15:cf:66:74:10:80:9d:86:de:8c:3d:9b:78:0a:
+         cb:87:dd:fb:87:e6:1b:74:f9:81:57:ae:92:c8:d0:62:78:63:
+         11:6d:34:2d:3f:f3:8b:82:e0:66:8f:0f:94:11:2e:62:06:6b:
+         1d:5e:7f:49:90:c6:9b:c3:22:ab:f3:62:3d:90:61:aa:3c:96:
+         28:55:b2:96:ec:ed:2a:f2:88:94:78:b9:12:ad:42:71:0e:ad:
+         d1:82:db:82:37:0b:e3:ed:f5:59:50:87:84:e6:1d:67:25:b5:
+         79:c3:90:00:6d:59:5f:ee:72:92:e8:9e:4a:e5:07:2a:0a:19:
+         8e:13:bd:2f:1f:9b:a4:c1:ca:e2:5d:1f:31:db:80:d2:52:55:
+         67:b8:a6:53:19:18:63:23:5b:49:3d:d6:06:7f:57:e3:43:de:
+         17:18:32:85:97:20:d5:dd:8a:7e:7c:3b:d0:cc:85:96:d5:96:
+         3c:29:76:85
 -----BEGIN CERTIFICATE-----
 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
-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
+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
-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
-wD4JaY82fvrIzf9yPt+S949Ez3f+bnTe
+azCCBCIwDQYJKoZIhvcNAQEBBQADggQPADCCBAoCggQBAM1monBIpnsu70AQ8Amf
+DujzO0MHLTm3VFWq2RYSgRiMEprO8Vya9V2WCToT7rTlqYgQmdl618bWan4mxR9j
+g7wJGhzr8Que3c00hgZMg6rJRVq9LaKulcdPl5n0gL9+OGedz5QS5OlrAGI9sMPE
+w5Ri6MV+VE6OoNmtjxhmQ5OqZsfzy0tHLKCUmRhA7YJTFarLZlYn7XiM7fMFiGvc
+LtEZ965K1I1VgZnsRsIs25ogoT36VKil+2bdpAnu0lrS+V0HSy97L+itl9tSWUEo
+pZCo0mPpuuaimNd6BLJjHTwJ6UyvuRzAPExKVYeepxaKDGtWhg/UMm5BBYkSVUUz
+V95JOE42P9zblbAT2kuWodMV64CZX+nUny+6gv8engCoW2OnEkn/JdWwdjLiBAEh
+XcgqEw/ygo/wzcpPAVqhn4chszOsDQ6D2D/325+d9rrBVDj+yaxZR5NRvag9NT/l
+hU7xiwZylDqurb8yzBnjxtc6dh5aLRDLZ/C8hvwMiVx9xCtheYyC6qmEVaL9H6sR
+oPqzJOuxLfYwVBn1caE0xjcgKTJWlylAY1yn/I5nmI+S7EkGBvtondYcniDanXQh
+jOcLgXqsLv2gjHfparIgfXi4znq7TIx0FAcfXeiRbybEVs78nwNZhblek7kbNavK
+PcIGtq1p4144hmbM5p5k9RF3vH1/nA7+AaXdhrKErvZszj0hGpqLpP6Rq+oYTuD6
++IpTpbBFMLDCYM7gPvVvFxXfphUETTSS4Iht7qL0w3z9pHk100TFpJgUpaQuX2Tg
+t0/asSJqLmtAlo1Pkq1VNqD+vHkmJVxlJzZbQO+w6KtiH59+p0fuMjf8AH6cA3aC
+/Xt2mFjRqO2xoZkJkgyX2JJ+db871cMED7U+hmS/WlGaWAmud7/pZiuJ9qpyr9bO
+MbMga5YyNdAOv6mUxrHEPvok7RkXR3Uj330CoOmTmTccvJ/ZuWGZ3ca/dC+jSGGJ
+jDaru3o8XpWhg1X5bHLZaXpLwmaV3ihFyCbxHlk6Da/a8Ov9xOHoaMdijRbzc0F7
+ZZe2st6uB/XimPZ1AbOYKPoIESLfy8QswzwJk29K2W7NQiOnlgTYQHP9nQkzazhF
+nvvD+JtUG/n4dmMKR9lUIJfCOmVfpvU2Hjr2/2pb4USwF5s/SVo7x4cmN/oOZlC4
+wDmLsog+iz7GEYrJCZZm9rDY0HE1GcNhfH4rpdAtDQ7qBNyU8PBvC/8Amff8Ric4
+QLcmdf+6/dD1g1K7mmR3f18eFY6GiRTGq9yoG/ke3FURzChqHO+SQjs4wlUZ2ttG
+cNcXamZ+ukQ9OE+cnfqHIKHLhodizsU9rNd4sZM47qS+BGHKrgGRj8gUPHlh1oHz
+5kcCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBH
+ZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFLkM8GAi1MW6KIjFXzHgpinM
+4BXmMB8GA1UdIwQYMBaAFPMdoF9pM4qktHaXom6r/aC/8yzOMA0GCSqGSIb3DQEB
+CwUAA4IBAQA9wTDAppEQezrW2S7inCMDSIhyOp4CTc3+tvcUdx8PmJQ/7ZB+ZA0t
+1E143Y8QixXQZV4YaOp8vvU6hOUjquHQFWEgPFwGCjPiOaYRFc9mdBCAnYbejD2b
+eArLh937h+YbdPmBV66SyNBieGMRbTQtP/OLguBmjw+UES5iBmsdXn9JkMabwyKr
+82I9kGGqPJYoVbKW7O0q8oiUeLkSrUJxDq3RgtuCNwvj7fVZUIeE5h1nJbV5w5AA
+bVlf7nKS6J5K5QcqChmOE70vH5ukwcriXR8x24DSUlVnuKZTGRhjI1tJPdYGf1fj
+Q94XGDKFlyDV3Yp+fDvQzIWW1ZY8KXaF
 -----END CERTIFICATE-----
diff --git a/mysql-test/std_data/server8k-key.pem b/mysql-test/std_data/server8k-key.pem
index a383b359275..701539f7ace 100644
--- a/mysql-test/std_data/server8k-key.pem
+++ b/mysql-test/std_data/server8k-key.pem
@@ -1,99 +1,99 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/mysql-test/std_data/serversan-cert.pem b/mysql-test/std_data/serversan-cert.pem
index e47779f420d..b6494c29b00 100644
--- a/mysql-test/std_data/serversan-cert.pem
+++ b/mysql-test/std_data/serversan-cert.pem
@@ -5,56 +5,56 @@ Certificate:
     Signature Algorithm: sha256WithRSAEncryption
         Issuer: CN=cacert, C=FI, ST=Helsinki, L=Helsinki, O=MariaDB
         Validity
-            Not Before: Apr 25 20:52:33 2017 GMT
-            Not After : Apr 20 20:52:33 2037 GMT
+            Not Before: Apr 24 14:29:50 2019 GMT
+            Not After : Apr 19 14:29:50 2039 GMT
         Subject: C=FI, ST=Helsinki, L=Helsinki, O=MariaDB, CN=server
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
                 Public-Key: (1024 bit)
                 Modulus:
-                    00:a7:74:d4:2b:80:cb:96:08:2a:b9:c2:87:18:0d:
-                    69:2b:da:cf:ef:21:cb:05:d4:80:2c:f3:85:bc:78:
-                    b2:42:d9:9f:f1:dc:47:68:c5:af:5a:c9:01:f0:dd:
-                    91:cb:3a:b9:38:b2:36:6b:a3:66:ef:cd:44:0f:8f:
-                    39:57:60:ad:3b:44:33:51:c2:7f:cb:5c:8d:55:b8:
-                    1e:e8:80:e0:ed:9d:8d:10:7a:42:68:73:06:63:83:
-                    ce:db:05:5b:e1:7b:f9:0e:87:20:38:b8:11:6a:b7:
-                    59:3d:4a:ca:cb:60:e6:e1:73:d9:a2:24:4a:70:93:
-                    5e:cf:d5:04:d5:ad:ac:96:a5
+                    00:c4:ca:f5:53:66:e9:f7:48:39:dc:8c:d7:06:f4:
+                    03:3b:87:11:8e:8f:4d:a1:2b:b7:2a:38:37:6c:a2:
+                    34:2f:d4:9d:84:78:99:7f:6b:ec:c3:63:ea:e8:9c:
+                    57:af:a4:78:cf:59:5f:79:6b:29:11:2c:be:16:56:
+                    8f:7b:76:57:c9:36:d5:7f:58:10:f3:d1:c2:dc:09:
+                    17:f2:7b:fa:2d:71:c2:50:15:92:af:a0:58:32:f0:
+                    64:60:d3:9a:c6:3c:8a:31:e0:b6:b2:9f:29:7d:97:
+                    87:3c:62:bf:e6:8e:e7:2f:4a:ac:f7:fe:93:38:bc:
+                    86:d4:87:91:38:2d:ed:e2:0d
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Subject Alternative Name: 
-                DNS:localhost
+                IP Address:127.0.0.1, DNS:localhost
     Signature Algorithm: sha256WithRSAEncryption
-         4b:78:d9:09:4c:25:cc:fb:17:8f:31:13:ac:d7:36:2d:5f:d4:
-         ce:94:84:d2:a7:fa:e2:1e:ae:b6:72:1f:01:56:0f:89:80:c0:
-         01:ba:ad:d7:cb:24:c5:25:ec:f8:35:ac:52:1b:4f:af:7c:26:
-         8d:d4:d4:91:05:21:b7:ba:3f:6b:1b:8d:1d:a5:6b:7e:7d:be:
-         2f:6a:09:83:c2:c3:6c:2f:8a:31:fa:7b:36:3f:6d:e1:62:ca:
-         a0:3c:43:b8:53:5a:4a:b3:4d:7a:cb:9c:6e:db:a4:ce:a1:95:
-         5e:26:d8:22:39:8c:34:0e:92:bd:87:a2:b1:7a:68:25:57:17:
-         b2:d8:43:3b:98:e4:80:6b:7d:3e:ab:32:82:6d:b8:80:45:83:
-         d6:55:f8:cd:31:74:17:8c:42:75:09:71:66:b9:e0:94:16:ca:
-         1d:db:1e:89:12:a1:9f:00:cb:83:99:5d:5d:28:7a:df:2a:87:
-         b5:8d:f1:9c:b9:89:2a:0d:6c:af:61:00:41:cb:03:df:99:4a:
-         fe:93:81:88:ff:47:4e:2a:b5:2b:bf:85:0f:9a:21:7b:20:58:
-         7a:1c:67:b5:8b:da:db:03:69:25:db:76:0e:f9:23:57:8d:8a:
-         47:dc:15:16:7c:2d:66:8f:6a:10:f3:b2:ea:2e:31:c6:d4:2c:
-         90:15:56:f4
+         c5:83:b2:bb:a3:3b:a9:42:df:de:30:db:09:90:e1:3e:7a:19:
+         09:4b:82:a3:1d:e8:23:3f:61:46:b7:98:b3:2e:90:61:7f:c5:
+         a1:36:a6:3e:b0:5b:3f:a1:23:70:7d:0f:71:5b:13:0f:be:73:
+         1b:31:1a:b3:ce:f7:59:aa:b4:18:8d:37:e1:8c:07:af:10:18:
+         4e:37:16:b2:67:73:5b:79:c6:30:16:ab:62:c5:c2:3e:72:06:
+         fd:b2:2a:f5:92:99:32:7e:ed:65:7e:bd:b2:74:9d:38:d4:d5:
+         35:f8:06:dd:ac:85:75:e7:c2:6b:16:e8:2f:0f:c4:d3:b7:e7:
+         be:b6:cd:61:7b:29:e6:3a:c2:7c:38:46:fb:2c:a3:da:fe:84:
+         5f:79:99:2f:80:3e:ec:09:88:f4:31:cd:5c:d1:32:a1:9f:1f:
+         55:f2:9b:c6:4e:b2:26:04:9b:ee:04:42:d2:40:88:0e:c8:cf:
+         e0:6e:06:a1:6a:c8:1a:62:d0:7a:a4:19:4d:9c:e4:b6:57:e2:
+         1d:19:57:54:58:1b:cc:bf:b8:29:e2:15:1e:f1:96:be:30:9e:
+         4c:05:f9:90:e3:a1:7b:d7:e0:63:a6:d1:25:b1:80:81:f3:1b:
+         55:4f:c1:64:9f:a1:06:01:8c:9a:15:64:b9:12:96:a8:22:4b:
+         4a:d9:e3:04
 -----BEGIN CERTIFICATE-----
-MIICuzCCAaOgAwIBAgIBBDANBgkqhkiG9w0BAQsFADBWMQ8wDQYDVQQDDAZjYWNl
+MIICwTCCAamgAwIBAgIBBDANBgkqhkiG9w0BAQsFADBWMQ8wDQYDVQQDDAZjYWNl
 cnQxCzAJBgNVBAYTAkZJMREwDwYDVQQIDAhIZWxzaW5raTERMA8GA1UEBwwISGVs
-c2lua2kxEDAOBgNVBAoMB01hcmlhREIwHhcNMTcwNDI1MjA1MjMzWhcNMzcwNDIw
-MjA1MjMzWjBWMQswCQYDVQQGEwJGSTERMA8GA1UECAwISGVsc2lua2kxETAPBgNV
+c2lua2kxEDAOBgNVBAoMB01hcmlhREIwHhcNMTkwNDI0MTQyOTUwWhcNMzkwNDE5
+MTQyOTUwWjBWMQswCQYDVQQGEwJGSTERMA8GA1UECAwISGVsc2lua2kxETAPBgNV
 BAcMCEhlbHNpbmtpMRAwDgYDVQQKDAdNYXJpYURCMQ8wDQYDVQQDDAZzZXJ2ZXIw
-gZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKd01CuAy5YIKrnChxgNaSvaz+8h
-ywXUgCzzhbx4skLZn/HcR2jFr1rJAfDdkcs6uTiyNmujZu/NRA+POVdgrTtEM1HC
-f8tcjVW4HuiA4O2djRB6QmhzBmODztsFW+F7+Q6HIDi4EWq3WT1Kystg5uFz2aIk
-SnCTXs/VBNWtrJalAgMBAAGjGDAWMBQGA1UdEQQNMAuCCWxvY2FsaG9zdDANBgkq
-hkiG9w0BAQsFAAOCAQEAS3jZCUwlzPsXjzETrNc2LV/UzpSE0qf64h6utnIfAVYP
-iYDAAbqt18skxSXs+DWsUhtPr3wmjdTUkQUht7o/axuNHaVrfn2+L2oJg8LDbC+K
-Mfp7Nj9t4WLKoDxDuFNaSrNNesucbtukzqGVXibYIjmMNA6SvYeisXpoJVcXsthD
-O5jkgGt9Pqsygm24gEWD1lX4zTF0F4xCdQlxZrnglBbKHdseiRKhnwDLg5ldXSh6
-3yqHtY3xnLmJKg1sr2EAQcsD35lK/pOBiP9HTiq1K7+FD5oheyBYehxntYva2wNp
-Jdt2DvkjV42KR9wVFnwtZo9qEPOy6i4xxtQskBVW9A==
+gZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMTK9VNm6fdIOdyM1wb0AzuHEY6P
+TaErtyo4N2yiNC/UnYR4mX9r7MNj6uicV6+keM9ZX3lrKREsvhZWj3t2V8k21X9Y
+EPPRwtwJF/J7+i1xwlAVkq+gWDLwZGDTmsY8ijHgtrKfKX2Xhzxiv+aO5y9KrPf+
+kzi8htSHkTgt7eINAgMBAAGjHjAcMBoGA1UdEQQTMBGHBH8AAAGCCWxvY2FsaG9z
+dDANBgkqhkiG9w0BAQsFAAOCAQEAxYOyu6M7qULf3jDbCZDhPnoZCUuCox3oIz9h
+RreYsy6QYX/FoTamPrBbP6EjcH0PcVsTD75zGzEas873Waq0GI034YwHrxAYTjcW
+smdzW3nGMBarYsXCPnIG/bIq9ZKZMn7tZX69snSdONTVNfgG3ayFdefCaxboLw/E
+07fnvrbNYXsp5jrCfDhG+yyj2v6EX3mZL4A+7AmI9DHNXNEyoZ8fVfKbxk6yJgSb
+7gRC0kCIDsjP4G4GoWrIGmLQeqQZTZzktlfiHRlXVFgbzL+4KeIVHvGWvjCeTAX5
+kOOhe9fgY6bRJbGAgfMbVU/BZJ+hBgGMmhVkuRKWqCJLStnjBA==
 -----END CERTIFICATE-----
diff --git a/mysql-test/std_data/serversan-key.pem b/mysql-test/std_data/serversan-key.pem
index 393c0bc9c1a..0fcb42b4f63 100644
--- a/mysql-test/std_data/serversan-key.pem
+++ b/mysql-test/std_data/serversan-key.pem
@@ -1,16 +1,16 @@
 -----BEGIN PRIVATE KEY-----
-MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAKd01CuAy5YIKrnC
-hxgNaSvaz+8hywXUgCzzhbx4skLZn/HcR2jFr1rJAfDdkcs6uTiyNmujZu/NRA+P
-OVdgrTtEM1HCf8tcjVW4HuiA4O2djRB6QmhzBmODztsFW+F7+Q6HIDi4EWq3WT1K
-ystg5uFz2aIkSnCTXs/VBNWtrJalAgMBAAECgYBReSgZmmpzLroK8zhjXXMEIUv1
-3w02YvOR61HwJxEkMVn+hNxBf50XoKDPHh5nMMUZbqvHpxLYLZilsVuGxcTCPVzw
-YxTooPcJY8x61oUclI2Ls5czu/OfzoJhA9ESaFn6e4xReUFmNi8ygTMuPReZZ90T
-ZvDikonKtCCk99MSaQJBANrmlPtfY57KJ18f1TqLvqy73I1vQjffSOrK3deYbvvB
-jUJ79G9Wzj8Hje2y+XkkK+OIPcND1DnoTCTuqVazn+cCQQDD1jy8zrVg/JEPhQkS
-BM7nvm4PIb0cgTPrOhsHDIF4hbaAZnA0N4ZEJ2q7YitXfOeR98x+aH/WJOrzzhmE
-VXOTAkBQ4lK6b4zH57qUk5aeg3R5LxFX0XyOWJsA5uUB/PlFXUdtAZBYc6LR92Ci
-LDeyY4M0F+t6c12/5+3615UKzGSRAkA+SGV6utcOqGTOJcZTt7nCFFtWbqmBZkoH
-1qv/2udWWFhJj8rBoKMQC+UzAS69nVjcoI2l6kA17/nVXkfZQYAHAkEAmOHCZCVQ
-9CCYTJICvoZR2euUYdnatLN8d2/ARWjzcRDTdS82P2oscATwAsvJxsphDmbOmVWP
-Hfy1t8OOCHKYAQ==
+MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAMTK9VNm6fdIOdyM
+1wb0AzuHEY6PTaErtyo4N2yiNC/UnYR4mX9r7MNj6uicV6+keM9ZX3lrKREsvhZW
+j3t2V8k21X9YEPPRwtwJF/J7+i1xwlAVkq+gWDLwZGDTmsY8ijHgtrKfKX2Xhzxi
+v+aO5y9KrPf+kzi8htSHkTgt7eINAgMBAAECgYAKFt29COm1494TkKT1lk0UIDim
+NnKkcLlTUM6Go0pJqXzp7cTw43egDN9eTaWxO512A/8BGp1gZAra2lVA3zBg6Yqb
+QYJwT2s/DsCwFU0msw1sUr5ynJ4A/jQCwR6RzaP2xoJTPaczpoE+RiOmgvQ14GF4
+sJEfAIJCw5OglICTgQJBAOK3yeiMSF6ic8OORkOHy8LdQAFGOsKwliQltxzvRXYZ
+dWlHHAX+9l6rVC+o0rbooO4QEfJHn9ojjROr5+iIn2cCQQDeNbljgN+6K36r9Qmh
+fuBy2Ot+wRO30T4ASFelgJ0aHYEngSGSRneMmbbgDFx7v7Y9k6yY9RPiSqYX+vCQ
+425rAkAjfkpp0axyxFQDRX7Si6vmseSXTntch3C57/2e1ga12n57INrORYAkigYA
+ABoc8IZhPrrQh04LRI2Nitgfm2P5AkBmqEFGk/JIKvHxdVoGrvv4cviQ7ZgzcsqH
+DOTZBAsQVpMlcgXVcxKl9RnEdlF/pjkGR6QUYhzWjZAgQgFDnp6TAkBqIXYMvyp7
+JRfbnhze+UBgjeCoE/wTv/DiXL1yi4uVVVm8luToFv9DPAyvms/guJ7Ade5HDHye
+M/LZbE37/NYP
 -----END PRIVATE KEY-----
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;
 }
 
diff --git a/mysql-test/t/ssl_verify_ip.opt b/mysql-test/t/ssl_verify_ip.opt
new file mode 100644
index 00000000000..7b1c308e46b
--- /dev/null
+++ b/mysql-test/t/ssl_verify_ip.opt
@@ -0,0 +1,3 @@
+--loose-enable-ssl
+--loose-ssl-cert=$MYSQL_TEST_DIR/std_data/serversan-cert.pem
+--loose-ssl-key=$MYSQL_TEST_DIR/std_data/serversan-key.pem
diff --git a/mysql-test/t/ssl_verify_ip.test b/mysql-test/t/ssl_verify_ip.test
new file mode 100644
index 00000000000..2a2e780ecfc
--- /dev/null
+++ b/mysql-test/t/ssl_verify_ip.test
@@ -0,0 +1,3 @@
+source include/have_ssl_crypto_functs.inc;
+--exec $MYSQL --protocol=tcp --host=127.0.0.1 --ssl-ca=$MYSQL_TEST_DIR/std_data/cacert.pem --ssl --ssl-verify-server-cert -e "select 1"
+--exec $MYSQL --protocol=tcp --host=localhost --ssl-ca=$MYSQL_TEST_DIR/std_data/cacert.pem --ssl --ssl-verify-server-cert -e "select 1"
diff --git a/sql-common/client.c b/sql-common/client.c
index 60aa558dfb3..4420a1afc17 100644
--- a/sql-common/client.c
+++ b/sql-common/client.c
@@ -1838,8 +1838,10 @@ static int ssl_verify_server_cert(Vio *vio, const char* server_hostname, const c
   */
 
 #ifdef HAVE_X509_check_host
-  ret_validation= X509_check_host(server_cert, server_hostname,
-                                  strlen(server_hostname), 0, 0) != 1;
+  ret_validation=
+   (X509_check_host(server_cert, server_hostname,
+       strlen(server_hostname), 0, 0) != 1) &&
+   (X509_check_ip_asc(server_cert, server_hostname, 0) != 1);
 #else
   subject= X509_get_subject_name(server_cert);
   cn_loc= X509_NAME_get_index_by_NID(subject, NID_commonName, -1);
-- 
cgit v1.2.1