diff --git a/mysql-test/lib/generate-ssl-certs.sh b/mysql-test/lib/generate-ssl-certs.sh
index 3331b81b931..57caf3b7a4e 100755
--- a/mysql-test/lib/generate-ssl-certs.sh
+++ b/mysql-test/lib/generate-ssl-certs.sh
@@ -9,21 +9,26 @@ cd std_data/
 rm -rf demoCA
 mkdir demoCA demoCA/newcerts
 touch demoCA/index.txt
+touch demoCA/index.txt.attr
 echo 01 > demoCA/serial
 echo 01 > demoCA/crlnumber
 
+# Use rsa:3072 at minimum for all keys to be future compatible with next OpenSSL releases
+# See level 3 in https://www.openssl.org/docs/man1.1.0/man3/SSL_CTX_set_security_level.html
+# Following industry practice, jump directly to rsa:4096 instead of just rsa:3072.
+
 # CA certificate, self-signed
-openssl req -x509 -newkey rsa:2048 -keyout cakey.pem -out cacert.pem -days 7300 -nodes -subj '/CN=cacert/C=FI/ST=Helsinki/L=Helsinki/O=MariaDB' -text
+openssl req -x509 -newkey rsa:4096 -keyout cakey.pem -out cacert.pem -days 7300 -nodes -subj '/CN=cacert/C=FI/ST=Helsinki/L=Helsinki/O=MariaDB' -text
 
 # server certificate signing request and private key. Note the very long subject (for MDEV-7859)
-openssl req -newkey rsa:2048 -keyout server-key.pem -out demoCA/server-req.pem -days 7300 -nodes -subj '/CN=localhost/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/OU=organizational unit name, a division name within an organization/O=organization name, typically a company name'
+openssl req -newkey rsa:4096 -keyout server-key.pem -out demoCA/server-req.pem -days 7300 -nodes -subj '/CN=localhost/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/OU=organizational unit name, a division name within an organization/O=organization name, typically a company name'
 # convert the key to yassl compatible format
 openssl rsa -in server-key.pem -out server-key.pem
 # sign the server certificate with CA certificate
 openssl ca -keyfile cakey.pem -days 7300 -batch -cert cacert.pem -policy policy_anything -out server-cert.pem -in demoCA/server-req.pem
 
 # server certificate with different validity period (MDEV-7598)
-openssl req -newkey rsa:2048 -keyout server-new-key.pem -out demoCA/server-new-req.pem -days 7301 -nodes -subj '/CN=server-new/C=FI/ST=Helsinki/L=Helsinki/O=MariaDB'
+openssl req -newkey rsa:4096 -keyout server-new-key.pem -out demoCA/server-new-req.pem -days 7301 -nodes -subj '/CN=server-new/C=FI/ST=Helsinki/L=Helsinki/O=MariaDB'
 openssl rsa -in server-new-key.pem -out server-new-key.pem
 openssl ca -keyfile cakey.pem -days 7301 -batch -cert cacert.pem -policy policy_anything -out server-new-cert.pem -in demoCA/server-new-req.pem
 
@@ -36,11 +41,11 @@ openssl ca -keyfile cakey.pem -days 7300 -batch -cert cacert.pem -policy policy_
 cat > demoCA/sanext.conf <<EOF
 subjectAltName=IP:127.0.0.1, DNS:localhost
 EOF
-openssl req -newkey rsa:2048 -keyout serversan-key.pem -out demoCA/serversan-req.pem -days 7300 -nodes -subj '/CN=server/C=FI/ST=Helsinki/L=Helsinki/O=MariaDB'
+openssl req -newkey rsa:4096 -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 -in demoCA/serversan-req.pem
 
 # client cert
-openssl req -newkey rsa:2048 -keyout client-key.pem -out demoCA/client-req.pem -days 7300 -nodes -subj '/CN=client/C=FI/ST=Helsinki/L=Helsinki/O=MariaDB'
+openssl req -newkey rsa:4096 -keyout client-key.pem -out demoCA/client-req.pem -days 7300 -nodes -subj '/CN=client/C=FI/ST=Helsinki/L=Helsinki/O=MariaDB'
 openssl rsa -in client-key.pem -out client-key.pem
 openssl ca -keyfile cakey.pem -days 7300 -batch -cert cacert.pem -policy policy_anything -out client-cert.pem -in demoCA/client-req.pem
 
diff --git a/mysql-test/main/ssl.result b/mysql-test/main/ssl.result
index b2ca0cf80ad..794830e5529 100644
--- a/mysql-test/main/ssl.result
+++ b/mysql-test/main/ssl.result
@@ -4,10 +4,10 @@ have_ssl
 1
 SHOW STATUS LIKE 'Ssl_server_not_before';
 Variable_name	Value
-Ssl_server_not_before	Jan 27 10:11:10 2019 GMT
+Ssl_server_not_before	Mar  3 03:03:03 2020 GMT
 SHOW STATUS LIKE 'Ssl_server_not_after';
 Variable_name	Value
-Ssl_server_not_after	Jan 22 10:11:10 2039 GMT
+Ssl_server_not_after	Feb 27 03:03:03 2040 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/std_data/cacert.pem b/mysql-test/std_data/cacert.pem
index 23dda2318e1..16d2d68ca6b 100644
--- a/mysql-test/std_data/cacert.pem
+++ b/mysql-test/std_data/cacert.pem
@@ -2,78 +2,120 @@ Certificate:
     Data:
         Version: 3 (0x2)
         Serial Number:
-            d0:4d:23:85:ee:59:b3:fa
-    Signature Algorithm: sha256WithRSAEncryption
-        Issuer: CN=cacert, C=FI, ST=Helsinki, L=Helsinki, O=MariaDB
+            5c:81:fd:b9:82:69:e0:46:8d:99:ed:d0:95:4b:d3:d6:62:8a:69:97
+        Signature Algorithm: sha256WithRSAEncryption
+        Issuer: CN = cacert, C = FI, ST = Helsinki, L = Helsinki, O = MariaDB
         Validity
-            Not Before: Jan 27 10:11:10 2019 GMT
-            Not After : Jan 22 10:11:10 2039 GMT
-        Subject: CN=cacert, C=FI, ST=Helsinki, L=Helsinki, O=MariaDB
+            Not Before: Mar  3 03:03:03 2020 GMT
+            Not After : Feb 27 03:03:03 2040 GMT
+        Subject: CN = cacert, C = FI, ST = Helsinki, L = Helsinki, O = MariaDB
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
+                RSA Public-Key: (4096 bit)
                 Modulus:
-                    00:e8:0e:a7:84:d3:75:30:06:30:b2:10:b9:d1:88:
-                    36:2b:5e:f8:c8:44:57:cb:67:72:ab:96:95:33:d5:
-                    88:d1:8f:23:50:98:ba:6d:20:00:80:bd:35:d5:c1:
-                    bf:98:49:c4:0a:15:4a:34:a6:21:9b:2e:8c:15:09:
-                    f0:63:81:02:c2:7c:e2:53:e0:f7:a1:1a:40:5e:8f:
-                    41:4a:4c:56:d4:20:f1:d5:a7:c1:53:2e:ff:7e:37:
-                    17:cc:7e:74:bd:e2:22:33:ce:8c:77:62:a4:c5:3f:
-                    44:35:7b:7e:b9:f5:7d:8c:7a:27:58:fd:2c:42:86:
-                    2e:e7:6b:01:99:7b:fe:7d:a7:a1:4f:3e:39:39:54:
-                    1f:61:de:74:66:d1:77:4f:43:1b:66:70:29:85:de:
-                    fc:8f:8e:1b:7b:a2:66:48:26:7f:9b:a6:fd:4a:e4:
-                    dc:eb:ed:bd:f8:e3:f1:57:98:13:6f:f1:a3:2a:e3:
-                    73:bd:8d:7c:6f:4b:59:35:bc:b5:42:3e:99:a7:13:
-                    8d:be:2e:5c:9a:c6:5b:ab:ae:bf:00:e9:c8:ee:05:
-                    22:8e:d5:67:1a:47:9a:6d:9c:f9:42:3e:15:34:f8:
-                    31:ec:b4:7e:d3:92:95:b0:b8:f9:66:f3:bd:1d:31:
-                    2c:b1:90:62:a1:f8:4e:a6:5d:26:22:f0:e1:fe:16:
-                    2b:69
+                    00:bc:72:01:10:68:c1:df:fa:d1:77:55:7c:09:13:
+                    19:51:41:cd:ed:4f:51:43:22:e7:97:0e:94:fc:0d:
+                    1d:a9:c6:f3:17:79:31:6f:12:7a:9b:7f:87:e2:55:
+                    16:d5:a4:dd:6a:d3:5e:4f:e2:e0:bc:c4:9f:c5:95:
+                    1a:47:13:a5:cd:6d:f3:76:e2:9a:12:31:76:e4:f1:
+                    01:94:37:45:10:32:18:9e:cc:d8:7f:04:ca:18:97:
+                    bf:22:2e:51:ba:73:6f:46:50:36:fe:df:82:4c:8a:
+                    9e:34:be:44:f4:12:61:72:18:b3:81:b5:d9:b2:69:
+                    8f:7d:f4:8b:41:62:34:59:71:f7:e4:26:a6:cf:55:
+                    4d:d4:52:a3:37:24:bd:82:21:9f:d1:db:cd:e9:12:
+                    a9:cf:60:48:3d:da:ea:a0:a7:d0:57:16:68:49:e5:
+                    b4:e8:dc:d0:b0:12:b3:c7:1c:f1:b3:b1:eb:12:8b:
+                    c7:3e:3c:02:fe:f6:4c:a8:35:d8:cf:74:64:63:89:
+                    84:3e:75:88:a0:0b:80:5c:ea:68:b2:9c:bb:e3:ae:
+                    4f:cd:24:b9:97:89:95:4e:3f:78:48:ba:ad:97:4c:
+                    bf:f8:8b:14:80:f4:78:03:11:4b:a7:e3:99:1c:82:
+                    59:bf:b6:f3:3e:3e:db:db:38:73:91:8d:f0:6f:e5:
+                    5d:02:e7:c0:a5:8b:ad:69:f1:17:29:2c:16:41:ad:
+                    ac:0f:64:c8:f7:62:58:da:73:66:f7:91:2c:89:f7:
+                    80:6b:d7:91:f1:c8:4a:5a:c4:2d:3d:0b:18:83:f1:
+                    e9:74:2d:83:bb:09:46:bd:f0:40:ad:0b:dd:0c:45:
+                    64:8d:9e:cf:a7:a0:6c:d2:cc:f1:f9:05:15:7a:e3:
+                    02:15:b0:e6:99:cd:81:5b:dd:52:9b:c0:35:25:fa:
+                    4c:88:47:1d:16:19:9f:9d:f0:54:01:6e:20:6a:10:
+                    ab:4f:d2:a2:a7:31:db:6d:76:26:0d:35:9d:ac:1f:
+                    4e:4d:37:87:2c:78:26:d4:1f:f0:87:fc:f4:e2:2a:
+                    af:9a:a4:d6:69:93:16:4f:ed:fb:e0:78:99:36:49:
+                    d2:2e:7d:44:15:94:58:bd:ba:bc:d3:b9:75:5c:58:
+                    13:69:18:8e:5d:0e:c9:0c:dd:06:c4:7b:fc:34:3e:
+                    df:51:46:8d:5e:33:40:ba:39:75:9a:29:a5:f0:be:
+                    d3:a1:2c:72:88:85:4a:a0:2e:d9:71:15:30:49:57:
+                    f4:1b:73:e4:b3:b1:9e:3e:e6:0b:30:0a:eb:e9:cc:
+                    ec:98:4c:36:ea:58:8a:aa:b1:4b:b9:e1:5e:4a:d0:
+                    81:65:f0:ba:2c:b0:a6:8e:02:f1:c6:e0:78:b9:49:
+                    eb:8e:79
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Subject Key Identifier: 
-                CA:71:99:89:F0:72:AB:75:66:BB:65:6A:03:04:72:A5:7B:95:A6:93
+                4D:FC:7A:19:F3:2B:0C:7D:F6:C0:7C:4D:F8:72:34:4C:8C:35:52:74
             X509v3 Authority Key Identifier: 
-                keyid:CA:71:99:89:F0:72:AB:75:66:BB:65:6A:03:04:72:A5:7B:95:A6:93
+                keyid:4D:FC:7A:19:F3:2B:0C:7D:F6:C0:7C:4D:F8:72:34:4C:8C:35:52:74
 
-            X509v3 Basic Constraints: 
+            X509v3 Basic Constraints: critical
                 CA:TRUE
     Signature Algorithm: sha256WithRSAEncryption
-         df:fd:74:29:5b:5e:9a:8b:09:02:40:59:73:cb:71:47:3f:97:
-         3d:a9:fd:c4:8c:01:29:c9:86:b8:71:55:ff:72:0e:50:dc:c8:
-         b5:e6:91:41:52:47:21:30:cc:4d:e7:3b:4b:db:55:ea:7d:46:
-         eb:53:e0:b7:1b:80:7c:b1:0c:d3:d1:bc:a0:73:ae:96:1f:fd:
-         05:52:7e:54:d5:03:52:69:7b:34:5f:27:d7:98:da:98:76:73:
-         e6:bb:50:59:2a:94:90:67:03:1c:a4:76:2f:ee:ef:59:60:09:
-         48:33:03:2b:52:ed:83:42:f8:71:19:7f:d8:be:40:ed:20:01:
-         90:3c:7e:1c:8b:d2:9f:f3:2f:09:1f:50:c8:10:e1:8a:d9:a5:
-         49:9c:0b:74:17:b9:2b:68:f6:1e:73:c2:73:10:38:b3:35:e2:
-         87:91:1b:a1:d1:9b:81:9d:1b:32:cc:03:6e:4c:82:95:81:11:
-         42:56:e2:16:2b:22:65:db:40:2c:ca:dc:03:f4:d5:07:cf:f5:
-         13:b2:cf:51:5b:24:cd:c7:d1:9b:42:8e:f9:df:5d:1e:5a:09:
-         a3:4f:a9:0b:f4:21:c5:bb:ff:02:93:67:e8:2d:ee:ab:d9:59:
-         76:03:2c:a1:bd:fb:dc:af:b6:82:94:71:85:53:a8:18:0d:3a:
-         9e:42:eb:59
+         3c:e7:3a:e8:b6:d1:be:ca:27:ad:02:00:08:b7:1f:2d:e9:cd:
+         81:9f:98:f0:f0:a4:c5:dd:dc:94:a1:a6:bd:31:56:54:05:6a:
+         da:b1:1b:42:35:ef:f8:75:1c:0d:0f:00:77:24:a7:ef:5f:f1:
+         ce:38:3a:05:a7:22:a6:40:b6:6c:57:46:31:e8:ba:2f:b5:9e:
+         fb:7c:07:93:5c:cb:82:59:1a:2f:13:5b:6d:55:8d:d9:dd:ec:
+         44:b2:7f:89:26:37:da:fc:e8:aa:af:87:8b:5e:c3:3e:21:c2:
+         a0:ca:2a:49:78:fa:9d:10:5c:e8:2c:24:ac:e8:f3:61:25:cb:
+         86:6c:8f:1d:4c:2f:83:bd:d4:72:dc:54:1b:fa:3d:1a:d4:54:
+         a9:ac:87:70:ff:cf:53:26:1f:e7:11:bc:b3:89:d0:71:25:09:
+         d9:80:09:42:b1:5a:8d:01:a9:89:1e:2c:cc:89:e7:f8:c2:43:
+         4b:20:cd:ce:9c:2f:67:99:35:4f:e2:ec:00:07:3d:69:6e:9e:
+         48:93:d4:56:b1:0b:52:00:d9:86:05:1e:ea:64:68:a1:87:04:
+         0f:17:45:82:8e:f5:13:7a:90:79:c8:fd:42:e8:80:df:3b:46:
+         bc:39:c9:76:14:90:8e:cd:80:98:84:56:43:88:33:1e:ac:4a:
+         cb:48:8d:ff:35:d4:68:0e:ef:bf:1a:b5:34:17:7a:c8:c2:e8:
+         f0:18:f6:58:07:9b:09:9f:b5:e2:29:e2:5e:cb:b9:71:ce:13:
+         90:6d:b7:4e:23:31:bc:ab:17:b4:3d:96:17:4b:f8:01:49:b9:
+         0a:0c:73:1d:54:de:51:79:3a:fb:f0:b5:10:8d:38:ad:87:36:
+         0f:36:48:11:f7:1b:d6:2f:ed:a7:1d:73:74:45:19:69:1d:9f:
+         86:ec:a3:2b:8e:fd:5a:33:08:4d:17:41:df:57:8a:1e:99:c1:
+         bc:aa:15:a1:af:2c:23:67:4e:31:45:91:fb:8f:af:1e:19:a6:
+         0f:bb:d9:3a:55:cc:b0:a2:41:a5:99:20:cc:64:91:f7:8e:6b:
+         c4:ad:5a:c8:ca:3d:74:36:91:97:34:f1:f8:c5:22:87:6b:e3:
+         cf:9c:0a:75:5a:09:30:88:9d:07:99:2d:ef:87:75:45:ed:0f:
+         75:8a:88:6c:b0:7e:dc:c3:d4:50:c4:25:0c:de:f7:53:f6:12:
+         bd:5a:8b:81:3a:30:83:b7:66:5e:7e:8f:d8:65:ab:2a:fa:85:
+         d4:4b:61:fb:27:98:79:cb:d6:06:07:23:7f:d9:1d:79:3e:71:
+         a7:0c:c8:e8:0e:e0:40:66:4d:8d:0e:9c:41:c0:d2:2c:91:95:
+         63:d5:c4:12:cd:9b:bc:f4
 -----BEGIN CERTIFICATE-----
-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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 0e2f7dce244..7c4ca137746 100644
--- a/mysql-test/std_data/cakey.pem
+++ b/mysql-test/std_data/cakey.pem
@@ -1,28 +1,52 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDoDqeE03UwBjCy
-ELnRiDYrXvjIRFfLZ3KrlpUz1YjRjyNQmLptIACAvTXVwb+YScQKFUo0piGbLowV
-CfBjgQLCfOJT4PehGkBej0FKTFbUIPHVp8FTLv9+NxfMfnS94iIzzox3YqTFP0Q1
-e3659X2MeidY/SxChi7nawGZe/59p6FPPjk5VB9h3nRm0XdPQxtmcCmF3vyPjht7
-omZIJn+bpv1K5Nzr7b344/FXmBNv8aMq43O9jXxvS1k1vLVCPpmnE42+Llyaxlur
-rr8A6cjuBSKO1WcaR5ptnPlCPhU0+DHstH7TkpWwuPlm870dMSyxkGKh+E6mXSYi
-8OH+FitpAgMBAAECggEBAMSw7yKxjSnIhWvYq3fDiY6XcC1naDb7FwIDn7GQs+hT
-9+3vlky6jFKSjdgB4iD1nVmilAQuMFv1Rzzp8LyWdD1fVwMbsyj1NEwyBngwXoRs
-7C5Zg467Tkmv7tcg9FiiHLVmxD7I+LpLlsfyRgbe4qy4OTO/W82DKKx0UaXDqIDd
-gIiBM5Vj9s1Lzoi7r2lXtuuEeRCH0mf9sAygqAkmj50i0vI05kQtIzJluU8KufPy
-DbQryaz5CWvXr4wdN3KbrVw5yRk9wz8JsIW1CRQshmVb5hZ+sS97eO11WKumen0I
-wXP8Z3s6NhTaeJvW/AsPZ2xm/vM/rLo1634tUZzzQ4UCgYEA+zIJ/TQ7Rfot30lu
-oz3d8moXW6B5iDUYQ6VuFY/0qImlFkR91BPp/XtZ0FyiVHEvF8hUQQc6jzCQylot
-QHOuW/hRWxFrVZndVhhgtAd4tFd39yOa8pkFifj8Wkdq6q0KuA+/qtCnVDwEEe+n
-U4xZXJmZ8schLRy9A5Js9NNckhcCgYEA7H7oCVBhNQRfcylBs5Y41qmIvokpU76B
-u6Pk7OwhVoe9aO41VXXjPwLJaPw7U2270CEuKB0YhVY1cpqFZdkuUsfwYh6ju6xY
-AIzeZuGw7LAXM+DabHnc6NKKAG6b9uBEh3f+N93NnLM8yPJheCbRGcC67gbEIB+Q
-7Z3TX8QtHn8CgYEAqSv9EDriBHHF/Q/uZCAhXsZWbs33q2Ter4g1SG5H/k2dEg8U
-kwTKXH17cllAtg/4AFNZcuYUaSTzDmSG/1YpQiVNXUCxAdh6+SW30ucJQqN51sZy
-7xlhYpd+FKrudZgOlQF+OuMFHjTBJPc6wIjQEg4cYSX80O3+2e3+VTAXswcCgYEA
-hfur58LzH383uF2yTFUaJHtt7kx07m3qv+ytgJCSnpxOcckqzBz6vrMMen8T+UMc
-+WAi7zT0tG3P3/qtArOVK+78QAqNxoBwZvdn9K9+dcmZi5mjBXvQ7NKCvpXrpGUQ
-ThNsIih2GYXuNQYktFaBdm6bOMj6ihx4FjapDwNscG8CgYAnGxSNAgAsoMzfhSbp
-fYQYqGlufvTHknavHW1tQagxFdew9tsYYA9XQJtwB4pnYZ6vEGOnp74g4Y6i2VPx
-1T4T5ctDX0oydWe1lNZR8iszU9Fes9YnWviS2KWE0s3NDii/3UDUDqc4ZmgRUOIs
-gcAXPXgP9Kgz6kRH/9VkzAFfkQ==
+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
+c1N9tJuNAAkztr93osxAiv/nbZil
 -----END PRIVATE KEY-----
diff --git a/mysql-test/std_data/client-cert.crl b/mysql-test/std_data/client-cert.crl
index 1f737bf790b..39274af368e 100644
--- a/mysql-test/std_data/client-cert.crl
+++ b/mysql-test/std_data/client-cert.crl
@@ -1,12 +1,17 @@
 -----BEGIN X509 CRL-----
-MIIBxTCBrgIBATANBgkqhkiG9w0BAQsFADBWMQ8wDQYDVQQDDAZjYWNlcnQxCzAJ
+MIICxTCBrgIBATANBgkqhkiG9w0BAQsFADBWMQ8wDQYDVQQDDAZjYWNlcnQxCzAJ
 BgNVBAYTAkZJMREwDwYDVQQIDAhIZWxzaW5raTERMA8GA1UEBwwISGVsc2lua2kx
-EDAOBgNVBAoMB01hcmlhREIXDTE5MDEyNzEwMTExNVoXDTM5MDEyMjEwMTExNVow
-FDASAgEFFw0xOTAxMjcxMDExMTVaoA4wDDAKBgNVHRQEAwIBAjANBgkqhkiG9w0B
-AQsFAAOCAQEAI0yg8tW6n8m/3g4FO5fjrtwEB1HYnJVLbKT2fOSKs7WN/t6M4ZWo
-hSolEpNozd0yP+20srCMzsg7PuiYV/jMJn0bCw+Q6G7IP2GBlBURRErJ6UNZ+Upe
-Gc+o5tWvb7ROwMj76UBzK5tDsmDapk5102k0sfaIbD51OmA+RxnxbKsGNvAVp9EH
-yN+irF6vfVmbP1WPzGZa6x2s70kiC3peQlnZFOUnhycwVdiRprcUd+ZfMLJ3Ov2b
-oa9P+ntTW/0ijg0QYH6gSQVOl9ZiVhnRR/eO6SrkrevgtAM3pXl4aDdvFyoIXXkh
-mCkYfW7LkH/+OYWyZ1W99cnISM2F+yC1yQ==
+EDAOBgNVBAoMB01hcmlhREIXDTIwMDMwMzAzMDMwM1oXDTQwMDIyNzAzMDMwM1ow
+FDASAgEFFw0yMDAzMDMwMzAzMDNaoA4wDDAKBgNVHRQEAwIBAjANBgkqhkiG9w0B
+AQsFAAOCAgEABDz2kH3Cf4L8xuOWHLoO8y0OIavWMgR/qiDD+kwOUpupxI8GtfBi
+Prkyz/xAWF15rWrEMpr4+KYG1TAUFFj9VLRldfwe4vY524OSKO+a4HKCrSQ8ZIsp
+4Xu2dMcopvVQtT1SpGS2W5Pfe3fu0bqhRQN03HXVtxPHlqjCbdIx5oukVVrFXREc
+9h/3QjDhTuXC2Zcd0IBdRx3+SMphRCIuHdMvqxEMoTqeSGLKdkqhmxLH+RiyuZiP
+WNFl2iYG8l8oLMLjUQe3xeAJSrg/eVzQMc3nFLvqD+dPUVXezAaFq8HJmtrVbpPc
+GG+kQJrcWgQoWS6tucLn+lzyfRJI8ueoTWPBaVv8VSJ9hsJABqR7ggE4KTSr4mXd
+dLd9J6z/1rdB9jZjMcYzJJfZgbU/bDwXK0o890VC46ovJT6BcZIV/cvYYMLJgA/o
++LNa4iu5RgalsCnqGYbs13mCXmBYgpq0wn7O62fUhIB4uDDYLpJfRfF7lySxYKEp
+Q9z+s+8wkn6uWsnl1O2mmQlkTe06qQcoQCqR9/1egDqdIIXSVSCQu1qvS3qy0mrk
+GzVDvGgdzeE1u2ylcLMTIqAdMNpqPuyg69RO26n0PDDoAn+0yuu176f+hcnrrmXX
+iKW9A7GDPn8RcEZ5oU3165T/879FjmrQB3dLQxPyva2IkzkFJn/RFzc=
 -----END X509 CRL-----
diff --git a/mysql-test/std_data/client-cert.pem b/mysql-test/std_data/client-cert.pem
index dbd94f57702..82b4851136a 100644
--- a/mysql-test/std_data/client-cert.pem
+++ b/mysql-test/std_data/client-cert.pem
@@ -2,34 +2,51 @@ Certificate:
     Data:
         Version: 3 (0x2)
         Serial Number: 5 (0x5)
-    Signature Algorithm: sha256WithRSAEncryption
+        Signature Algorithm: sha256WithRSAEncryption
         Issuer: CN=cacert, C=FI, ST=Helsinki, L=Helsinki, O=MariaDB
         Validity
-            Not Before: Jan 27 10:11:15 2019 GMT
-            Not After : Jan 22 10:11:15 2039 GMT
+            Not Before: Mar  3 03:03:03 2020 GMT
+            Not After : Feb 27 03:03:03 2040 GMT
         Subject: C=FI, ST=Helsinki, L=Helsinki, O=MariaDB, CN=client
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
+                RSA Public-Key: (4096 bit)
                 Modulus:
-                    00:a9:10:77:b5:42:8f:e8:ad:69:2a:03:e9:56:f5:
-                    2d:d5:ba:92:06:cc:7f:c8:d2:0f:c5:47:fd:3e:db:
-                    e1:5b:2b:40:ca:f8:05:9c:12:55:ef:0c:4a:92:3d:
-                    01:ac:0a:21:72:c4:b4:d9:59:82:75:1d:0c:63:fe:
-                    5a:20:7f:c5:53:b2:b9:05:88:60:c7:d9:fd:0f:ce:
-                    8f:10:a3:23:74:8f:21:70:56:73:c2:07:f0:79:20:
-                    52:1d:e0:30:9d:ed:0d:5a:f2:68:1b:0c:9e:2d:62:
-                    d6:5c:e3:72:2d:92:79:aa:d0:f0:3a:ed:d6:52:30:
-                    3a:e7:91:5e:98:4e:2f:a0:07:d7:73:78:42:02:7d:
-                    c4:2c:d3:63:03:b7:72:a5:33:da:f7:e9:3f:93:c9:
-                    37:19:9f:33:62:4f:1a:03:c3:a6:4b:f4:f5:51:e4:
-                    ef:af:d6:a7:9a:55:5f:bc:d3:a9:77:90:59:8c:29:
-                    b5:2d:3d:ef:ba:cd:21:54:24:79:6e:91:be:08:b6:
-                    b1:9c:78:be:6d:2f:56:72:10:69:91:ee:b3:bd:eb:
-                    77:b3:c1:bf:c7:28:c6:ad:70:37:68:da:42:8a:7f:
-                    dc:3b:40:78:d5:f2:a5:c1:43:c3:61:8e:bb:d0:b8:
-                    2d:05:41:7e:f2:b2:49:86:8b:ad:d7:fb:e0:9b:48:
-                    7d:af
+                    00:e6:69:89:28:b0:92:32:09:0b:6c:d5:0d:32:ae:
+                    8a:08:19:39:83:ad:26:7b:33:e2:a3:a2:f7:f9:ae:
+                    4f:cd:ab:58:75:8d:66:a3:0d:f4:43:a9:de:4e:04:
+                    03:70:01:0b:fc:eb:04:a1:14:76:61:8d:25:5c:15:
+                    65:dd:f2:a6:cf:23:6e:d6:9f:d8:0c:d1:cc:5e:7e:
+                    8c:2b:de:43:b6:1b:59:fe:f1:7c:76:09:ad:44:26:
+                    2a:61:b1:d1:6d:b5:ea:11:2f:da:00:79:30:6c:a7:
+                    3a:3a:5b:ad:a6:db:29:51:cf:1f:c8:d4:14:57:31:
+                    48:6e:2c:d7:93:bc:c5:2e:c0:a3:6d:7a:4e:ac:46:
+                    57:f5:7a:1f:5c:e7:c3:b8:89:d9:62:8a:05:0c:d8:
+                    88:94:a7:79:ec:71:c8:aa:00:d6:b2:d1:a3:9c:04:
+                    b7:d0:6c:f0:fe:e7:c5:5f:e9:44:9f:d1:15:71:c9:
+                    de:c1:40:9a:e0:c4:4c:04:20:ed:39:03:f8:fc:4c:
+                    ba:5b:f5:48:99:c9:48:b0:47:34:03:81:01:36:c1:
+                    db:a8:12:d1:25:cc:60:bd:91:a2:cf:f6:43:dc:dc:
+                    82:09:74:80:25:45:67:bb:31:0e:dc:6f:6e:85:15:
+                    c9:f4:88:fa:4c:45:9e:d5:90:b1:9f:94:ec:2d:e6:
+                    09:3b:82:41:60:0b:ee:92:9c:28:90:e3:ee:b6:b6:
+                    dd:fe:fd:8e:fe:12:ba:4b:a9:1c:1f:8b:0c:7d:14:
+                    af:fd:f8:bd:86:ab:79:05:0c:7d:1d:6b:96:67:f8:
+                    cc:d1:5e:cb:ea:d0:ae:5c:e4:c7:7b:c8:a4:b7:0a:
+                    4d:e7:40:94:fa:96:4b:68:c8:3b:72:f6:3b:0d:cf:
+                    51:bf:1e:d8:1d:cd:db:b4:f4:12:2a:31:91:bb:e7:
+                    b5:25:3d:6a:67:68:ee:40:5b:ad:9b:20:5e:64:ba:
+                    cb:76:32:ff:47:30:4e:fc:48:3d:d0:dd:30:f8:02:
+                    8a:1f:96:dd:2e:d2:3c:ca:90:78:65:68:d8:df:67:
+                    10:50:04:65:c5:14:b1:59:ef:48:fb:87:81:fe:c4:
+                    d2:1d:ac:2d:d3:44:5f:26:62:43:54:7c:46:6d:e4:
+                    de:bd:7d:a4:f5:68:0d:47:d9:32:d9:be:17:4b:79:
+                    3a:c0:7c:82:08:7a:f5:ee:79:6b:9e:4a:6e:03:ea:
+                    4c:2a:13:5f:35:c9:ac:94:fb:23:36:de:4d:b4:bb:
+                    18:77:db:73:95:4c:eb:33:ce:01:3c:87:18:2e:c4:
+                    49:e4:cd:aa:44:e8:26:13:3d:59:9d:db:c4:87:3b:
+                    e1:da:31:a6:65:79:42:13:9e:20:cd:dd:26:e7:20:
+                    66:a3:e1
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Basic Constraints: 
@@ -37,45 +54,70 @@ Certificate:
             Netscape Comment: 
                 OpenSSL Generated Certificate
             X509v3 Subject Key Identifier: 
-                CE:F4:DF:1F:F9:52:2E:37:2D:3D:8A:B6:DE:41:8C:13:F6:14:4E:57
+                F6:F8:72:05:F3:7C:EC:D5:D0:83:D2:ED:1D:60:98:82:54:D9:09:56
             X509v3 Authority Key Identifier: 
-                keyid:CA:71:99:89:F0:72:AB:75:66:BB:65:6A:03:04:72:A5:7B:95:A6:93
+                keyid:4D:FC:7A:19:F3:2B:0C:7D:F6:C0:7C:4D:F8:72:34:4C:8C:35:52:74
 
     Signature Algorithm: sha256WithRSAEncryption
-         65:61:98:4c:62:3c:25:3b:12:2b:4d:78:9a:81:20:e2:4d:1e:
-         1e:c3:78:ca:1b:5b:84:13:7b:11:da:f3:ad:d0:19:f0:02:0c:
-         99:44:d8:52:89:e5:ee:61:9d:8e:ac:30:7a:dc:fc:7e:73:e3:
-         28:39:25:00:78:f2:00:66:63:96:3a:10:af:2b:35:b5:3e:09:
-         87:99:97:dd:29:0b:23:eb:95:fe:a8:f4:f5:4f:db:dd:ac:96:
-         94:7b:b1:ef:47:15:54:6f:d8:1b:43:39:00:34:9f:ad:49:fb:
-         21:26:94:74:20:61:ce:c5:b3:3d:5f:51:46:58:56:dc:2c:8c:
-         c3:74:97:83:63:3d:ad:0b:f6:81:63:4d:cb:30:af:45:ce:28:
-         fe:e0:68:c4:8f:1a:61:80:7e:56:8d:fc:31:5a:9f:33:37:1f:
-         ae:4e:0d:6c:25:e3:0e:13:af:01:1b:82:41:95:a1:83:47:61:
-         40:dd:d4:36:fb:73:7a:98:61:d1:e2:5f:1e:a1:a1:a8:ea:e3:
-         30:c8:74:c2:d2:82:6d:30:e5:e8:8f:b0:2d:1a:93:8e:ab:6b:
-         a6:17:36:a3:a2:0c:86:9c:b2:4e:1f:d7:6f:ef:04:f9:05:20:
-         b7:4f:e5:e3:9b:58:38:06:aa:d3:64:15:9a:bf:8a:97:fd:39:
-         b7:5f:e2:9e
+         28:17:1b:03:11:ab:8f:62:d2:1a:ce:36:af:25:48:4d:ee:32:
+         24:b7:b5:76:95:74:55:7d:fd:18:e4:63:92:c3:08:75:b4:93:
+         6a:31:20:f2:ad:7a:b2:21:c6:86:f2:a7:92:01:53:2f:f2:f4:
+         dd:56:a5:7a:97:b6:05:01:0e:ca:9e:c2:d1:68:3c:ac:75:4a:
+         c9:c4:2f:e3:fb:54:9d:62:27:80:4a:fa:5b:de:03:c3:98:6f:
+         f1:1a:cf:29:a0:1b:a2:2b:66:d8:d9:02:86:d4:d9:14:32:9f:
+         9b:6c:09:d4:07:b8:a9:03:cb:4e:d8:69:ae:93:76:19:43:19:
+         6b:fe:b9:6d:ee:3a:39:4c:37:67:d0:db:bd:69:39:aa:64:fe:
+         18:32:3d:af:06:ae:86:1c:41:b6:29:3c:5d:ed:d3:33:a5:0b:
+         35:d7:1b:3f:d2:db:ea:ce:6f:83:08:d6:d9:91:cc:d6:56:e6:
+         7e:7b:ae:ef:6f:65:47:0f:90:74:41:4d:0f:f0:e6:f8:36:63:
+         25:a6:81:27:09:71:40:d1:65:27:3d:be:78:3e:6c:7d:f9:c2:
+         09:f1:61:4e:7d:05:34:d7:bb:0c:95:2e:8f:53:23:66:34:4a:
+         19:be:79:be:d0:03:68:7b:a7:a5:44:dd:2b:bb:c7:4c:0a:a3:
+         f0:2e:cf:01:6b:25:81:b8:19:f3:cf:35:e9:2c:9e:5b:6b:b0:
+         9b:47:76:46:19:da:74:17:e6:e3:4d:de:b2:38:7c:35:c7:87:
+         d6:62:a6:12:fb:71:bf:f3:ee:54:d3:aa:c2:f7:6b:11:67:e4:
+         0e:23:43:2a:9a:93:ea:fa:4d:39:dd:42:62:db:d0:da:70:9f:
+         44:eb:ba:e3:e6:76:10:5b:98:b9:17:b9:d0:da:db:73:20:ce:
+         2c:d9:28:be:97:82:d5:a9:75:65:88:c5:7c:0e:40:b9:9b:13:
+         17:9d:e9:a9:38:9c:7c:11:75:4e:69:c1:ad:63:55:1d:7c:ec:
+         35:38:e7:13:46:ca:2e:7b:99:09:1f:5b:fd:62:68:c5:4f:24:
+         20:db:b3:bc:56:e7:23:91:40:d0:47:90:1c:ca:f7:d9:26:24:
+         20:69:f4:41:7c:83:dc:c2:4c:ee:86:8d:6d:b9:63:01:5d:15:
+         85:8b:e9:e3:d8:0a:4b:0c:14:9f:87:a5:45:3a:b8:3c:57:80:
+         89:18:c4:7e:d7:c3:73:63:f2:af:eb:49:ec:bb:fc:44:c7:5e:
+         c8:09:35:20:3e:cc:8b:25:18:ec:98:fc:65:97:a7:ba:9d:af:
+         59:7d:81:24:b8:27:dc:52:80:75:39:3a:6f:a0:50:50:fe:e1:
+         da:b9:ec:1c:43:f1:db:ad
 -----BEGIN CERTIFICATE-----
-MIIDojCCAoqgAwIBAgIBBTANBgkqhkiG9w0BAQsFADBWMQ8wDQYDVQQDDAZjYWNl
+MIIFojCCA4qgAwIBAgIBBTANBgkqhkiG9w0BAQsFADBWMQ8wDQYDVQQDDAZjYWNl
 cnQxCzAJBgNVBAYTAkZJMREwDwYDVQQIDAhIZWxzaW5raTERMA8GA1UEBwwISGVs
-c2lua2kxEDAOBgNVBAoMB01hcmlhREIwHhcNMTkwMTI3MTAxMTE1WhcNMzkwMTIy
-MTAxMTE1WjBWMQswCQYDVQQGEwJGSTERMA8GA1UECAwISGVsc2lua2kxETAPBgNV
+c2lua2kxEDAOBgNVBAoMB01hcmlhREIwHhcNMjAwMzAzMDMwMzAzWhcNNDAwMjI3
+MDMwMzAzWjBWMQswCQYDVQQGEwJGSTERMA8GA1UECAwISGVsc2lua2kxETAPBgNV
 BAcMCEhlbHNpbmtpMRAwDgYDVQQKDAdNYXJpYURCMQ8wDQYDVQQDDAZjbGllbnQw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCpEHe1Qo/orWkqA+lW9S3V
-upIGzH/I0g/FR/0+2+FbK0DK+AWcElXvDEqSPQGsCiFyxLTZWYJ1HQxj/logf8VT
-srkFiGDH2f0Pzo8QoyN0jyFwVnPCB/B5IFId4DCd7Q1a8mgbDJ4tYtZc43Itknmq
-0PA67dZSMDrnkV6YTi+gB9dzeEICfcQs02MDt3KlM9r36T+TyTcZnzNiTxoDw6ZL
-9PVR5O+v1qeaVV+806l3kFmMKbUtPe+6zSFUJHlukb4ItrGceL5tL1ZyEGmR7rO9
-63ezwb/HKMatcDdo2kKKf9w7QHjV8qXBQ8NhjrvQuC0FQX7yskmGi63X++CbSH2v
-AgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2Vu
-ZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBTO9N8f+VIuNy09irbeQYwT9hRO
-VzAfBgNVHSMEGDAWgBTKcZmJ8HKrdWa7ZWoDBHKle5WmkzANBgkqhkiG9w0BAQsF
-AAOCAQEAZWGYTGI8JTsSK014moEg4k0eHsN4yhtbhBN7EdrzrdAZ8AIMmUTYUonl
-7mGdjqwwetz8fnPjKDklAHjyAGZjljoQrys1tT4Jh5mX3SkLI+uV/qj09U/b3ayW
-lHux70cVVG/YG0M5ADSfrUn7ISaUdCBhzsWzPV9RRlhW3CyMw3SXg2M9rQv2gWNN
-yzCvRc4o/uBoxI8aYYB+Vo38MVqfMzcfrk4NbCXjDhOvARuCQZWhg0dhQN3UNvtz
-ephh0eJfHqGhqOrjMMh0wtKCbTDl6I+wLRqTjqtrphc2o6IMhpyyTh/Xb+8E+QUg
-t0/l45tYOAaq02QVmr+Kl/05t1/ing==
+ggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDmaYkosJIyCQts1Q0yrooI
+GTmDrSZ7M+Kjovf5rk/Nq1h1jWajDfRDqd5OBANwAQv86wShFHZhjSVcFWXd8qbP
+I27Wn9gM0cxefowr3kO2G1n+8Xx2Ca1EJiphsdFtteoRL9oAeTBspzo6W62m2ylR
+zx/I1BRXMUhuLNeTvMUuwKNtek6sRlf1eh9c58O4idliigUM2IiUp3nscciqANay
+0aOcBLfQbPD+58Vf6USf0RVxyd7BQJrgxEwEIO05A/j8TLpb9UiZyUiwRzQDgQE2
+wduoEtElzGC9kaLP9kPc3IIJdIAlRWe7MQ7cb26FFcn0iPpMRZ7VkLGflOwt5gk7
+gkFgC+6SnCiQ4+62tt3+/Y7+ErpLqRwfiwx9FK/9+L2Gq3kFDH0da5Zn+MzRXsvq
+0K5c5Md7yKS3Ck3nQJT6lktoyDty9jsNz1G/Htgdzdu09BIqMZG757UlPWpnaO5A
+W62bIF5kust2Mv9HME78SD3Q3TD4Aooflt0u0jzKkHhlaNjfZxBQBGXFFLFZ70j7
+h4H+xNIdrC3TRF8mYkNUfEZt5N69faT1aA1H2TLZvhdLeTrAfIIIevXueWueSm4D
+6kwqE181yayU+yM23k20uxh323OVTOszzgE8hxguxEnkzapE6CYTPVmd28SHO+Ha
+MaZleUITniDN3SbnIGaj4QIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIB
+DQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQU9vhy
+BfN87NXQg9LtHWCYglTZCVYwHwYDVR0jBBgwFoAUTfx6GfMrDH32wHxN+HI0TIw1
+UnQwDQYJKoZIhvcNAQELBQADggIBACgXGwMRq49i0hrONq8lSE3uMiS3tXaVdFV9
+/RjkY5LDCHW0k2oxIPKterIhxobyp5IBUy/y9N1WpXqXtgUBDsqewtFoPKx1SsnE
+L+P7VJ1iJ4BK+lveA8OYb/EazymgG6IrZtjZAobU2RQyn5tsCdQHuKkDy07Yaa6T
+dhlDGWv+uW3uOjlMN2fQ271pOapk/hgyPa8GroYcQbYpPF3t0zOlCzXXGz/S2+rO
+b4MI1tmRzNZW5n57ru9vZUcPkHRBTQ/w5vg2YyWmgScJcUDRZSc9vng+bH35wgnx
+YU59BTTXuwyVLo9TI2Y0Shm+eb7QA2h7p6VE3Su7x0wKo/AuzwFrJYG4GfPPNeks
+nltrsJtHdkYZ2nQX5uNN3rI4fDXHh9ZiphL7cb/z7lTTqsL3axFn5A4jQyqak+r6
+TTndQmLb0Npwn0TruuPmdhBbmLkXudDa23MgzizZKL6XgtWpdWWIxXwOQLmbExed
+6ak4nHwRdU5pwa1jVR187DU45xNGyi57mQkfW/1iaMVPJCDbs7xW5yORQNBHkBzK
+99kmJCBp9EF8g9zCTO6GjW25YwFdFYWL6ePYCksMFJ+HpUU6uDxXgIkYxH7Xw3Nj
+8q/rSey7/ETHXsgJNSA+zIslGOyY/GWXp7qdr1l9gSS4J9xSgHU5Om+gUFD+4dq5
+7BxD8dut
 -----END CERTIFICATE-----
diff --git a/mysql-test/std_data/client-certkey.pem b/mysql-test/std_data/client-certkey.pem
index f60b9db309a..4787f2d59d1 100644
--- a/mysql-test/std_data/client-certkey.pem
+++ b/mysql-test/std_data/client-certkey.pem
@@ -2,34 +2,51 @@ Certificate:
     Data:
         Version: 3 (0x2)
         Serial Number: 5 (0x5)
-    Signature Algorithm: sha256WithRSAEncryption
+        Signature Algorithm: sha256WithRSAEncryption
         Issuer: CN=cacert, C=FI, ST=Helsinki, L=Helsinki, O=MariaDB
         Validity
-            Not Before: Jan 27 10:11:15 2019 GMT
-            Not After : Jan 22 10:11:15 2039 GMT
+            Not Before: Mar  3 03:03:03 2020 GMT
+            Not After : Feb 27 03:03:03 2040 GMT
         Subject: C=FI, ST=Helsinki, L=Helsinki, O=MariaDB, CN=client
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
+                RSA Public-Key: (4096 bit)
                 Modulus:
-                    00:a9:10:77:b5:42:8f:e8:ad:69:2a:03:e9:56:f5:
-                    2d:d5:ba:92:06:cc:7f:c8:d2:0f:c5:47:fd:3e:db:
-                    e1:5b:2b:40:ca:f8:05:9c:12:55:ef:0c:4a:92:3d:
-                    01:ac:0a:21:72:c4:b4:d9:59:82:75:1d:0c:63:fe:
-                    5a:20:7f:c5:53:b2:b9:05:88:60:c7:d9:fd:0f:ce:
-                    8f:10:a3:23:74:8f:21:70:56:73:c2:07:f0:79:20:
-                    52:1d:e0:30:9d:ed:0d:5a:f2:68:1b:0c:9e:2d:62:
-                    d6:5c:e3:72:2d:92:79:aa:d0:f0:3a:ed:d6:52:30:
-                    3a:e7:91:5e:98:4e:2f:a0:07:d7:73:78:42:02:7d:
-                    c4:2c:d3:63:03:b7:72:a5:33:da:f7:e9:3f:93:c9:
-                    37:19:9f:33:62:4f:1a:03:c3:a6:4b:f4:f5:51:e4:
-                    ef:af:d6:a7:9a:55:5f:bc:d3:a9:77:90:59:8c:29:
-                    b5:2d:3d:ef:ba:cd:21:54:24:79:6e:91:be:08:b6:
-                    b1:9c:78:be:6d:2f:56:72:10:69:91:ee:b3:bd:eb:
-                    77:b3:c1:bf:c7:28:c6:ad:70:37:68:da:42:8a:7f:
-                    dc:3b:40:78:d5:f2:a5:c1:43:c3:61:8e:bb:d0:b8:
-                    2d:05:41:7e:f2:b2:49:86:8b:ad:d7:fb:e0:9b:48:
-                    7d:af
+                    00:e6:69:89:28:b0:92:32:09:0b:6c:d5:0d:32:ae:
+                    8a:08:19:39:83:ad:26:7b:33:e2:a3:a2:f7:f9:ae:
+                    4f:cd:ab:58:75:8d:66:a3:0d:f4:43:a9:de:4e:04:
+                    03:70:01:0b:fc:eb:04:a1:14:76:61:8d:25:5c:15:
+                    65:dd:f2:a6:cf:23:6e:d6:9f:d8:0c:d1:cc:5e:7e:
+                    8c:2b:de:43:b6:1b:59:fe:f1:7c:76:09:ad:44:26:
+                    2a:61:b1:d1:6d:b5:ea:11:2f:da:00:79:30:6c:a7:
+                    3a:3a:5b:ad:a6:db:29:51:cf:1f:c8:d4:14:57:31:
+                    48:6e:2c:d7:93:bc:c5:2e:c0:a3:6d:7a:4e:ac:46:
+                    57:f5:7a:1f:5c:e7:c3:b8:89:d9:62:8a:05:0c:d8:
+                    88:94:a7:79:ec:71:c8:aa:00:d6:b2:d1:a3:9c:04:
+                    b7:d0:6c:f0:fe:e7:c5:5f:e9:44:9f:d1:15:71:c9:
+                    de:c1:40:9a:e0:c4:4c:04:20:ed:39:03:f8:fc:4c:
+                    ba:5b:f5:48:99:c9:48:b0:47:34:03:81:01:36:c1:
+                    db:a8:12:d1:25:cc:60:bd:91:a2:cf:f6:43:dc:dc:
+                    82:09:74:80:25:45:67:bb:31:0e:dc:6f:6e:85:15:
+                    c9:f4:88:fa:4c:45:9e:d5:90:b1:9f:94:ec:2d:e6:
+                    09:3b:82:41:60:0b:ee:92:9c:28:90:e3:ee:b6:b6:
+                    dd:fe:fd:8e:fe:12:ba:4b:a9:1c:1f:8b:0c:7d:14:
+                    af:fd:f8:bd:86:ab:79:05:0c:7d:1d:6b:96:67:f8:
+                    cc:d1:5e:cb:ea:d0:ae:5c:e4:c7:7b:c8:a4:b7:0a:
+                    4d:e7:40:94:fa:96:4b:68:c8:3b:72:f6:3b:0d:cf:
+                    51:bf:1e:d8:1d:cd:db:b4:f4:12:2a:31:91:bb:e7:
+                    b5:25:3d:6a:67:68:ee:40:5b:ad:9b:20:5e:64:ba:
+                    cb:76:32:ff:47:30:4e:fc:48:3d:d0:dd:30:f8:02:
+                    8a:1f:96:dd:2e:d2:3c:ca:90:78:65:68:d8:df:67:
+                    10:50:04:65:c5:14:b1:59:ef:48:fb:87:81:fe:c4:
+                    d2:1d:ac:2d:d3:44:5f:26:62:43:54:7c:46:6d:e4:
+                    de:bd:7d:a4:f5:68:0d:47:d9:32:d9:be:17:4b:79:
+                    3a:c0:7c:82:08:7a:f5:ee:79:6b:9e:4a:6e:03:ea:
+                    4c:2a:13:5f:35:c9:ac:94:fb:23:36:de:4d:b4:bb:
+                    18:77:db:73:95:4c:eb:33:ce:01:3c:87:18:2e:c4:
+                    49:e4:cd:aa:44:e8:26:13:3d:59:9d:db:c4:87:3b:
+                    e1:da:31:a6:65:79:42:13:9e:20:cd:dd:26:e7:20:
+                    66:a3:e1
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Basic Constraints: 
@@ -37,72 +54,121 @@ Certificate:
             Netscape Comment: 
                 OpenSSL Generated Certificate
             X509v3 Subject Key Identifier: 
-                CE:F4:DF:1F:F9:52:2E:37:2D:3D:8A:B6:DE:41:8C:13:F6:14:4E:57
+                F6:F8:72:05:F3:7C:EC:D5:D0:83:D2:ED:1D:60:98:82:54:D9:09:56
             X509v3 Authority Key Identifier: 
-                keyid:CA:71:99:89:F0:72:AB:75:66:BB:65:6A:03:04:72:A5:7B:95:A6:93
+                keyid:4D:FC:7A:19:F3:2B:0C:7D:F6:C0:7C:4D:F8:72:34:4C:8C:35:52:74
 
     Signature Algorithm: sha256WithRSAEncryption
-         65:61:98:4c:62:3c:25:3b:12:2b:4d:78:9a:81:20:e2:4d:1e:
-         1e:c3:78:ca:1b:5b:84:13:7b:11:da:f3:ad:d0:19:f0:02:0c:
-         99:44:d8:52:89:e5:ee:61:9d:8e:ac:30:7a:dc:fc:7e:73:e3:
-         28:39:25:00:78:f2:00:66:63:96:3a:10:af:2b:35:b5:3e:09:
-         87:99:97:dd:29:0b:23:eb:95:fe:a8:f4:f5:4f:db:dd:ac:96:
-         94:7b:b1:ef:47:15:54:6f:d8:1b:43:39:00:34:9f:ad:49:fb:
-         21:26:94:74:20:61:ce:c5:b3:3d:5f:51:46:58:56:dc:2c:8c:
-         c3:74:97:83:63:3d:ad:0b:f6:81:63:4d:cb:30:af:45:ce:28:
-         fe:e0:68:c4:8f:1a:61:80:7e:56:8d:fc:31:5a:9f:33:37:1f:
-         ae:4e:0d:6c:25:e3:0e:13:af:01:1b:82:41:95:a1:83:47:61:
-         40:dd:d4:36:fb:73:7a:98:61:d1:e2:5f:1e:a1:a1:a8:ea:e3:
-         30:c8:74:c2:d2:82:6d:30:e5:e8:8f:b0:2d:1a:93:8e:ab:6b:
-         a6:17:36:a3:a2:0c:86:9c:b2:4e:1f:d7:6f:ef:04:f9:05:20:
-         b7:4f:e5:e3:9b:58:38:06:aa:d3:64:15:9a:bf:8a:97:fd:39:
-         b7:5f:e2:9e
+         28:17:1b:03:11:ab:8f:62:d2:1a:ce:36:af:25:48:4d:ee:32:
+         24:b7:b5:76:95:74:55:7d:fd:18:e4:63:92:c3:08:75:b4:93:
+         6a:31:20:f2:ad:7a:b2:21:c6:86:f2:a7:92:01:53:2f:f2:f4:
+         dd:56:a5:7a:97:b6:05:01:0e:ca:9e:c2:d1:68:3c:ac:75:4a:
+         c9:c4:2f:e3:fb:54:9d:62:27:80:4a:fa:5b:de:03:c3:98:6f:
+         f1:1a:cf:29:a0:1b:a2:2b:66:d8:d9:02:86:d4:d9:14:32:9f:
+         9b:6c:09:d4:07:b8:a9:03:cb:4e:d8:69:ae:93:76:19:43:19:
+         6b:fe:b9:6d:ee:3a:39:4c:37:67:d0:db:bd:69:39:aa:64:fe:
+         18:32:3d:af:06:ae:86:1c:41:b6:29:3c:5d:ed:d3:33:a5:0b:
+         35:d7:1b:3f:d2:db:ea:ce:6f:83:08:d6:d9:91:cc:d6:56:e6:
+         7e:7b:ae:ef:6f:65:47:0f:90:74:41:4d:0f:f0:e6:f8:36:63:
+         25:a6:81:27:09:71:40:d1:65:27:3d:be:78:3e:6c:7d:f9:c2:
+         09:f1:61:4e:7d:05:34:d7:bb:0c:95:2e:8f:53:23:66:34:4a:
+         19:be:79:be:d0:03:68:7b:a7:a5:44:dd:2b:bb:c7:4c:0a:a3:
+         f0:2e:cf:01:6b:25:81:b8:19:f3:cf:35:e9:2c:9e:5b:6b:b0:
+         9b:47:76:46:19:da:74:17:e6:e3:4d:de:b2:38:7c:35:c7:87:
+         d6:62:a6:12:fb:71:bf:f3:ee:54:d3:aa:c2:f7:6b:11:67:e4:
+         0e:23:43:2a:9a:93:ea:fa:4d:39:dd:42:62:db:d0:da:70:9f:
+         44:eb:ba:e3:e6:76:10:5b:98:b9:17:b9:d0:da:db:73:20:ce:
+         2c:d9:28:be:97:82:d5:a9:75:65:88:c5:7c:0e:40:b9:9b:13:
+         17:9d:e9:a9:38:9c:7c:11:75:4e:69:c1:ad:63:55:1d:7c:ec:
+         35:38:e7:13:46:ca:2e:7b:99:09:1f:5b:fd:62:68:c5:4f:24:
+         20:db:b3:bc:56:e7:23:91:40:d0:47:90:1c:ca:f7:d9:26:24:
+         20:69:f4:41:7c:83:dc:c2:4c:ee:86:8d:6d:b9:63:01:5d:15:
+         85:8b:e9:e3:d8:0a:4b:0c:14:9f:87:a5:45:3a:b8:3c:57:80:
+         89:18:c4:7e:d7:c3:73:63:f2:af:eb:49:ec:bb:fc:44:c7:5e:
+         c8:09:35:20:3e:cc:8b:25:18:ec:98:fc:65:97:a7:ba:9d:af:
+         59:7d:81:24:b8:27:dc:52:80:75:39:3a:6f:a0:50:50:fe:e1:
+         da:b9:ec:1c:43:f1:db:ad
 -----BEGIN CERTIFICATE-----
-MIIDojCCAoqgAwIBAgIBBTANBgkqhkiG9w0BAQsFADBWMQ8wDQYDVQQDDAZjYWNl
+MIIFojCCA4qgAwIBAgIBBTANBgkqhkiG9w0BAQsFADBWMQ8wDQYDVQQDDAZjYWNl
 cnQxCzAJBgNVBAYTAkZJMREwDwYDVQQIDAhIZWxzaW5raTERMA8GA1UEBwwISGVs
-c2lua2kxEDAOBgNVBAoMB01hcmlhREIwHhcNMTkwMTI3MTAxMTE1WhcNMzkwMTIy
-MTAxMTE1WjBWMQswCQYDVQQGEwJGSTERMA8GA1UECAwISGVsc2lua2kxETAPBgNV
+c2lua2kxEDAOBgNVBAoMB01hcmlhREIwHhcNMjAwMzAzMDMwMzAzWhcNNDAwMjI3
+MDMwMzAzWjBWMQswCQYDVQQGEwJGSTERMA8GA1UECAwISGVsc2lua2kxETAPBgNV
 BAcMCEhlbHNpbmtpMRAwDgYDVQQKDAdNYXJpYURCMQ8wDQYDVQQDDAZjbGllbnQw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCpEHe1Qo/orWkqA+lW9S3V
-upIGzH/I0g/FR/0+2+FbK0DK+AWcElXvDEqSPQGsCiFyxLTZWYJ1HQxj/logf8VT
-srkFiGDH2f0Pzo8QoyN0jyFwVnPCB/B5IFId4DCd7Q1a8mgbDJ4tYtZc43Itknmq
-0PA67dZSMDrnkV6YTi+gB9dzeEICfcQs02MDt3KlM9r36T+TyTcZnzNiTxoDw6ZL
-9PVR5O+v1qeaVV+806l3kFmMKbUtPe+6zSFUJHlukb4ItrGceL5tL1ZyEGmR7rO9
-63ezwb/HKMatcDdo2kKKf9w7QHjV8qXBQ8NhjrvQuC0FQX7yskmGi63X++CbSH2v
-AgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2Vu
-ZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBTO9N8f+VIuNy09irbeQYwT9hRO
-VzAfBgNVHSMEGDAWgBTKcZmJ8HKrdWa7ZWoDBHKle5WmkzANBgkqhkiG9w0BAQsF
-AAOCAQEAZWGYTGI8JTsSK014moEg4k0eHsN4yhtbhBN7EdrzrdAZ8AIMmUTYUonl
-7mGdjqwwetz8fnPjKDklAHjyAGZjljoQrys1tT4Jh5mX3SkLI+uV/qj09U/b3ayW
-lHux70cVVG/YG0M5ADSfrUn7ISaUdCBhzsWzPV9RRlhW3CyMw3SXg2M9rQv2gWNN
-yzCvRc4o/uBoxI8aYYB+Vo38MVqfMzcfrk4NbCXjDhOvARuCQZWhg0dhQN3UNvtz
-ephh0eJfHqGhqOrjMMh0wtKCbTDl6I+wLRqTjqtrphc2o6IMhpyyTh/Xb+8E+QUg
-t0/l45tYOAaq02QVmr+Kl/05t1/ing==
+ggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDmaYkosJIyCQts1Q0yrooI
+GTmDrSZ7M+Kjovf5rk/Nq1h1jWajDfRDqd5OBANwAQv86wShFHZhjSVcFWXd8qbP
+I27Wn9gM0cxefowr3kO2G1n+8Xx2Ca1EJiphsdFtteoRL9oAeTBspzo6W62m2ylR
+zx/I1BRXMUhuLNeTvMUuwKNtek6sRlf1eh9c58O4idliigUM2IiUp3nscciqANay
+0aOcBLfQbPD+58Vf6USf0RVxyd7BQJrgxEwEIO05A/j8TLpb9UiZyUiwRzQDgQE2
+wduoEtElzGC9kaLP9kPc3IIJdIAlRWe7MQ7cb26FFcn0iPpMRZ7VkLGflOwt5gk7
+gkFgC+6SnCiQ4+62tt3+/Y7+ErpLqRwfiwx9FK/9+L2Gq3kFDH0da5Zn+MzRXsvq
+0K5c5Md7yKS3Ck3nQJT6lktoyDty9jsNz1G/Htgdzdu09BIqMZG757UlPWpnaO5A
+W62bIF5kust2Mv9HME78SD3Q3TD4Aooflt0u0jzKkHhlaNjfZxBQBGXFFLFZ70j7
+h4H+xNIdrC3TRF8mYkNUfEZt5N69faT1aA1H2TLZvhdLeTrAfIIIevXueWueSm4D
+6kwqE181yayU+yM23k20uxh323OVTOszzgE8hxguxEnkzapE6CYTPVmd28SHO+Ha
+MaZleUITniDN3SbnIGaj4QIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIB
+DQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQU9vhy
+BfN87NXQg9LtHWCYglTZCVYwHwYDVR0jBBgwFoAUTfx6GfMrDH32wHxN+HI0TIw1
+UnQwDQYJKoZIhvcNAQELBQADggIBACgXGwMRq49i0hrONq8lSE3uMiS3tXaVdFV9
+/RjkY5LDCHW0k2oxIPKterIhxobyp5IBUy/y9N1WpXqXtgUBDsqewtFoPKx1SsnE
+L+P7VJ1iJ4BK+lveA8OYb/EazymgG6IrZtjZAobU2RQyn5tsCdQHuKkDy07Yaa6T
+dhlDGWv+uW3uOjlMN2fQ271pOapk/hgyPa8GroYcQbYpPF3t0zOlCzXXGz/S2+rO
+b4MI1tmRzNZW5n57ru9vZUcPkHRBTQ/w5vg2YyWmgScJcUDRZSc9vng+bH35wgnx
+YU59BTTXuwyVLo9TI2Y0Shm+eb7QA2h7p6VE3Su7x0wKo/AuzwFrJYG4GfPPNeks
+nltrsJtHdkYZ2nQX5uNN3rI4fDXHh9ZiphL7cb/z7lTTqsL3axFn5A4jQyqak+r6
+TTndQmLb0Npwn0TruuPmdhBbmLkXudDa23MgzizZKL6XgtWpdWWIxXwOQLmbExed
+6ak4nHwRdU5pwa1jVR187DU45xNGyi57mQkfW/1iaMVPJCDbs7xW5yORQNBHkBzK
+99kmJCBp9EF8g9zCTO6GjW25YwFdFYWL6ePYCksMFJ+HpUU6uDxXgIkYxH7Xw3Nj
+8q/rSey7/ETHXsgJNSA+zIslGOyY/GWXp7qdr1l9gSS4J9xSgHU5Om+gUFD+4dq5
+7BxD8dut
 -----END CERTIFICATE-----
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/mysql-test/std_data/client-key.pem b/mysql-test/std_data/client-key.pem
index 726cb5f5132..2df0fa6d487 100644
--- a/mysql-test/std_data/client-key.pem
+++ b/mysql-test/std_data/client-key.pem
@@ -1,27 +1,51 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/mysql-test/std_data/crldir/ed1f42db.r0 b/mysql-test/std_data/crldir/ed1f42db.r0
index 1f737bf790b..39274af368e 100644
--- a/mysql-test/std_data/crldir/ed1f42db.r0
+++ b/mysql-test/std_data/crldir/ed1f42db.r0
@@ -1,12 +1,17 @@
 -----BEGIN X509 CRL-----
-MIIBxTCBrgIBATANBgkqhkiG9w0BAQsFADBWMQ8wDQYDVQQDDAZjYWNlcnQxCzAJ
+MIICxTCBrgIBATANBgkqhkiG9w0BAQsFADBWMQ8wDQYDVQQDDAZjYWNlcnQxCzAJ
 BgNVBAYTAkZJMREwDwYDVQQIDAhIZWxzaW5raTERMA8GA1UEBwwISGVsc2lua2kx
-EDAOBgNVBAoMB01hcmlhREIXDTE5MDEyNzEwMTExNVoXDTM5MDEyMjEwMTExNVow
-FDASAgEFFw0xOTAxMjcxMDExMTVaoA4wDDAKBgNVHRQEAwIBAjANBgkqhkiG9w0B
-AQsFAAOCAQEAI0yg8tW6n8m/3g4FO5fjrtwEB1HYnJVLbKT2fOSKs7WN/t6M4ZWo
-hSolEpNozd0yP+20srCMzsg7PuiYV/jMJn0bCw+Q6G7IP2GBlBURRErJ6UNZ+Upe
-Gc+o5tWvb7ROwMj76UBzK5tDsmDapk5102k0sfaIbD51OmA+RxnxbKsGNvAVp9EH
-yN+irF6vfVmbP1WPzGZa6x2s70kiC3peQlnZFOUnhycwVdiRprcUd+ZfMLJ3Ov2b
-oa9P+ntTW/0ijg0QYH6gSQVOl9ZiVhnRR/eO6SrkrevgtAM3pXl4aDdvFyoIXXkh
-mCkYfW7LkH/+OYWyZ1W99cnISM2F+yC1yQ==
+EDAOBgNVBAoMB01hcmlhREIXDTIwMDMwMzAzMDMwM1oXDTQwMDIyNzAzMDMwM1ow
+FDASAgEFFw0yMDAzMDMwMzAzMDNaoA4wDDAKBgNVHRQEAwIBAjANBgkqhkiG9w0B
+AQsFAAOCAgEABDz2kH3Cf4L8xuOWHLoO8y0OIavWMgR/qiDD+kwOUpupxI8GtfBi
+Prkyz/xAWF15rWrEMpr4+KYG1TAUFFj9VLRldfwe4vY524OSKO+a4HKCrSQ8ZIsp
+4Xu2dMcopvVQtT1SpGS2W5Pfe3fu0bqhRQN03HXVtxPHlqjCbdIx5oukVVrFXREc
+9h/3QjDhTuXC2Zcd0IBdRx3+SMphRCIuHdMvqxEMoTqeSGLKdkqhmxLH+RiyuZiP
+WNFl2iYG8l8oLMLjUQe3xeAJSrg/eVzQMc3nFLvqD+dPUVXezAaFq8HJmtrVbpPc
+GG+kQJrcWgQoWS6tucLn+lzyfRJI8ueoTWPBaVv8VSJ9hsJABqR7ggE4KTSr4mXd
+dLd9J6z/1rdB9jZjMcYzJJfZgbU/bDwXK0o890VC46ovJT6BcZIV/cvYYMLJgA/o
++LNa4iu5RgalsCnqGYbs13mCXmBYgpq0wn7O62fUhIB4uDDYLpJfRfF7lySxYKEp
+Q9z+s+8wkn6uWsnl1O2mmQlkTe06qQcoQCqR9/1egDqdIIXSVSCQu1qvS3qy0mrk
+GzVDvGgdzeE1u2ylcLMTIqAdMNpqPuyg69RO26n0PDDoAn+0yuu176f+hcnrrmXX
+iKW9A7GDPn8RcEZ5oU3165T/879FjmrQB3dLQxPyva2IkzkFJn/RFzc=
 -----END X509 CRL-----
diff --git a/mysql-test/std_data/server-cert.crl b/mysql-test/std_data/server-cert.crl
index c841c893c57..0db83397fe0 100644
--- a/mysql-test/std_data/server-cert.crl
+++ b/mysql-test/std_data/server-cert.crl
@@ -1,12 +1,17 @@
 -----BEGIN X509 CRL-----
-MIIBxTCBrgIBATANBgkqhkiG9w0BAQsFADBWMQ8wDQYDVQQDDAZjYWNlcnQxCzAJ
+MIICxTCBrgIBATANBgkqhkiG9w0BAQsFADBWMQ8wDQYDVQQDDAZjYWNlcnQxCzAJ
 BgNVBAYTAkZJMREwDwYDVQQIDAhIZWxzaW5raTERMA8GA1UEBwwISGVsc2lua2kx
-EDAOBgNVBAoMB01hcmlhREIXDTE5MDEyNzEwMTExNVoXDTM5MDEyMjEwMTExNVow
-FDASAgEBFw0xOTAxMjcxMDExMTVaoA4wDDAKBgNVHRQEAwIBATANBgkqhkiG9w0B
-AQsFAAOCAQEAERRidERQcCHOE3ltJeftBHhZL4xi/NuOH0KlYK6I00Resrwz4UUm
-cvBzNBb7LqLw24tRvhAGXrSxDEKVsUc+54VBRfPrHbUR15/9eseCA7lIKRS0ub8q
-0fvtwinxyr4Y9hcP9ew9bUZxf99yegc6rNC7/8xZCnIOdvQQ5BpelPGmZ71tnBeg
-6UkW6IG0/BG1MlxRJenAlILtxwu+Q6lgRvVrAtSQJJxTCzCof6oM7vTDvlTHH1LL
-F11xIXP9rjNGw0qBJmxLT4J8tB++eV5u7MpSlbwQNga44zyyvBqdRuSyhFufXPBi
-hqUmVskfdZs9HYrqIWz9ipkFiMNXEzGNxA==
+EDAOBgNVBAoMB01hcmlhREIXDTIwMDMwMzAzMDMwM1oXDTQwMDIyNzAzMDMwM1ow
+FDASAgEBFw0yMDAzMDMwMzAzMDNaoA4wDDAKBgNVHRQEAwIBATANBgkqhkiG9w0B
+AQsFAAOCAgEAFsQCul/9vZ1qSxnYoVVlHPspJ6JFgg0kEK5ZQsiGaAKyvV1d9xpT
+uu1FxOEajbeOGdGk9kRqy928KFynPSTpWphl+bJ2E+uey4a9PTgAlxPEcdbnGf2f
+1je7i0pOlOximKkeRb8GB4EwNvS9MPKd2pkJnGgIK6eyTtOnKgvmkA3vwXIqB1wJ
+dbQMscQlWyCN7lz5A2D6T9xOYY5gKthBAdM73OgzivGKJekoCCirGqVjA7Kurpmt
+zV+UbDrHqxsBB4BS+X4sFp7n9K4dqD/acR7aYsjpxKUzc43rEzuTE8flQw1Hzk/h
+lGJKg0XfIs2ol7zSeADocZMQR8G0wpeFsz5abm5/oCQ007Rxn+2d/8ZPfOw75u2p
+vdcOARoU1q1qF1lGL3x5PFpam693VxB07js3qi6sCqJjsVETAmz08Bvck0+HeHpr
+nyQndk7EZPl7W+8Ls68kZZB+77DDNS9Gwb8BQxzazuvN4G6DQsZLYNhWyV6vPeOt
+sJF7mdvr4PElbtNG1WQFySt7SJKaA21hG1qVUqto8ZTd+/KU5b7MMnTM7nxFXQ3a
+WwHq79xK1xC4f87rrc423yYEjAQkb/1NSseGa/gfqo6wRcxXbRQETq2r9KIsLwAN
+sK1gO7Cl0SW9PtrCF4lWNOES9iSZ3BaacOHT7kD8qoBAL83CIlDFgWg=
 -----END X509 CRL-----
diff --git a/mysql-test/std_data/server-cert.pem b/mysql-test/std_data/server-cert.pem
index 068d7200c3e..b0bb96aecf0 100644
--- a/mysql-test/std_data/server-cert.pem
+++ b/mysql-test/std_data/server-cert.pem
@@ -2,34 +2,51 @@ Certificate:
     Data:
         Version: 3 (0x2)
         Serial Number: 1 (0x1)
-    Signature Algorithm: sha256WithRSAEncryption
+        Signature Algorithm: sha256WithRSAEncryption
         Issuer: CN=cacert, C=FI, ST=Helsinki, L=Helsinki, O=MariaDB
         Validity
-            Not Before: Jan 27 10:11:10 2019 GMT
-            Not After : Jan 22 10:11:10 2039 GMT
+            Not Before: Mar  3 03:03:03 2020 GMT
+            Not After : Feb 27 03:03:03 2040 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: (2048 bit)
+                RSA Public-Key: (4096 bit)
                 Modulus:
-                    00:eb:7c:4f:59:f0:40:37:ed:38:b2:e8:30:69:4e:
-                    95:c9:00:59:d1:60:3b:8a:aa:28:a1:20:40:ee:bf:
-                    1c:f3:b0:a6:40:8e:57:a4:79:81:c9:70:9f:8c:3d:
-                    f4:5c:b0:f9:58:55:d9:62:b2:4b:69:e1:1a:73:bf:
-                    03:0e:8b:ca:d3:0d:f2:12:ea:68:1e:b8:f5:ba:29:
-                    02:b0:15:7f:76:52:9a:7d:ee:6d:7e:2c:f5:5a:d0:
-                    8c:a7:c9:53:d8:8c:ce:e3:be:c7:bb:4a:ae:7c:f9:
-                    f1:6d:07:ac:3b:55:cd:83:3d:e4:ef:96:8e:a9:c9:
-                    1c:cb:84:99:cf:37:f5:53:57:e7:94:78:97:12:04:
-                    1f:dc:31:f8:f0:bf:7c:9b:ef:8a:25:02:1f:1b:ab:
-                    cd:f9:bd:a9:de:df:e1:3d:b2:fb:92:44:93:59:ab:
-                    f7:c2:a6:e1:05:19:49:fb:f8:02:5d:3e:d0:50:26:
-                    5b:e3:26:ac:fb:cf:ab:f1:52:0a:12:36:16:3d:b5:
-                    9e:12:f3:c3:69:e2:9b:89:70:b2:31:56:9a:9b:91:
-                    a4:c6:39:01:56:e4:b5:8b:35:70:4e:eb:45:1b:70:
-                    7d:1a:52:2f:a5:37:32:80:ae:50:d0:da:4a:85:6a:
-                    3c:66:e7:41:85:c8:3a:dd:25:d8:4c:32:85:cb:12:
-                    bc:81
+                    00:c9:f9:46:27:69:68:4b:5a:26:dd:1f:98:0f:44:
+                    ba:40:83:ca:82:c2:7a:53:cc:b9:30:f1:ca:3e:e2:
+                    6d:de:3a:11:aa:ce:c5:90:27:e6:f3:4f:3b:e9:af:
+                    1a:ec:21:d7:ca:14:1f:f1:9b:cb:cd:7e:57:b4:c8:
+                    5d:6c:cd:5a:54:dd:8a:9a:a9:27:ef:49:d3:6c:ac:
+                    99:2d:dc:e5:c0:1e:3c:05:9f:c5:04:c7:2d:81:66:
+                    21:27:16:d6:c3:e4:97:53:db:21:a6:43:50:70:cb:
+                    2e:95:fb:da:52:55:27:1b:17:ef:19:83:eb:ff:a1:
+                    fc:62:63:ea:2f:fe:53:35:e6:d9:bc:03:2d:e5:c2:
+                    18:b1:29:91:e4:a4:79:2c:f1:05:dd:d5:3f:ff:b1:
+                    9e:64:8d:60:29:74:43:f0:3d:31:e7:78:ce:9f:17:
+                    74:e5:9f:fb:7b:69:a9:45:3b:e8:76:03:c6:ca:52:
+                    85:84:50:0d:2b:98:6f:ff:d8:41:66:6d:39:f6:1a:
+                    a3:61:e2:82:5f:dc:ec:ca:97:dc:b2:dc:cf:aa:97:
+                    ef:13:10:ea:fb:8f:99:91:bb:d9:e8:61:25:2d:68:
+                    04:af:2f:89:56:0d:89:90:77:e0:ad:c2:25:eb:3c:
+                    d2:4e:3d:ca:6e:ae:35:c8:f2:94:7a:09:74:d3:8e:
+                    73:30:e6:39:fe:b6:9c:c7:4d:23:4e:b0:bf:90:97:
+                    29:b2:b3:30:b2:bb:49:ae:47:09:fe:cd:23:3a:01:
+                    a4:ac:cb:53:25:74:98:27:20:85:6b:18:74:bb:1c:
+                    bf:ff:05:dc:06:7c:02:78:81:1e:96:ad:8f:c6:a2:
+                    0d:b3:5c:8e:ad:d5:fd:af:c5:8d:8b:9f:31:b1:4f:
+                    a7:1e:9b:cd:57:68:d5:ad:ed:4e:7b:5f:0d:0c:d2:
+                    47:85:b4:65:4b:23:1c:5b:a5:ec:88:fa:42:80:73:
+                    84:cb:75:05:a6:39:f1:e6:a9:4e:15:e6:2f:f7:61:
+                    0b:f3:08:cc:a6:2b:2b:64:6e:04:a1:fc:da:5e:34:
+                    ad:7c:54:be:85:e4:ed:64:74:31:30:2a:ed:ab:3e:
+                    d2:cd:c7:3e:de:18:04:8a:a7:bd:ad:52:74:13:b1:
+                    b0:7d:4d:7e:87:7b:cb:82:1f:29:11:e1:0e:4b:42:
+                    2b:83:e8:88:7e:92:80:20:eb:ee:da:d4:dd:1e:9c:
+                    54:5c:67:a7:00:5f:a1:b7:bf:5d:c0:5a:25:2a:c1:
+                    1e:7c:93:32:dd:17:c8:02:6d:1a:42:26:f6:50:01:
+                    4b:df:29:7f:72:f1:90:72:80:8a:ba:2f:8c:86:7d:
+                    56:45:c5:0e:82:16:d8:29:03:57:87:ce:22:1c:7f:
+                    31:a8:4f
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Basic Constraints: 
@@ -37,50 +54,75 @@ Certificate:
             Netscape Comment: 
                 OpenSSL Generated Certificate
             X509v3 Subject Key Identifier: 
-                0B:18:61:66:8F:12:44:81:60:0D:80:D6:0A:6A:9E:DE:D7:69:56:B0
+                DB:DF:8B:BC:C2:EE:A9:2A:4E:FD:0E:7A:5F:15:CF:94:A3:0C:CA:CC
             X509v3 Authority Key Identifier: 
-                keyid:CA:71:99:89:F0:72:AB:75:66:BB:65:6A:03:04:72:A5:7B:95:A6:93
+                keyid:4D:FC:7A:19:F3:2B:0C:7D:F6:C0:7C:4D:F8:72:34:4C:8C:35:52:74
 
     Signature Algorithm: sha256WithRSAEncryption
-         ac:6b:15:7d:68:74:9d:ce:e2:ed:80:9c:f6:36:b5:54:8b:60:
-         38:d3:cd:43:5c:97:44:1b:c8:6d:73:e2:1d:6a:68:07:bf:c4:
-         0c:bf:ae:b9:f1:12:28:1b:07:6d:86:2e:8d:4d:1c:56:3e:e7:
-         d7:62:a1:a2:de:9b:7b:1a:8a:b4:7f:76:f1:cf:d3:b5:b0:95:
-         91:ce:7e:49:45:0f:11:a6:96:6b:7b:42:07:cc:8d:28:13:d2:
-         30:19:5a:c3:31:16:f6:0a:9a:d7:cd:8e:6f:be:8c:aa:91:40:
-         68:fa:4d:ff:9f:10:d6:3d:27:27:54:f7:64:fa:7a:89:d9:67:
-         4b:63:2b:da:cc:95:f1:30:10:e8:5e:cd:ce:43:c9:72:ad:32:
-         b6:06:cc:a9:02:dd:4d:9c:00:97:fc:99:80:84:bf:e3:54:5a:
-         e8:2c:a5:b3:30:8e:30:cb:3c:5f:74:18:43:a3:42:36:53:78:
-         62:4f:08:56:11:80:c2:12:1a:da:70:18:10:7f:3d:15:b4:73:
-         29:26:69:7d:3b:ec:f8:18:01:f7:ac:c2:8f:f2:37:8d:8d:fc:
-         78:87:bc:d4:cb:1d:c1:14:c7:9c:3b:dc:a9:fd:e8:86:2a:32:
-         51:fe:8d:89:cd:6a:9d:7a:6f:0c:52:4b:b2:4d:d3:dc:02:39:
-         8d:2d:25:6e
+         09:d1:af:0e:0b:e8:a2:5e:c8:ee:0a:9f:21:c3:2c:da:a4:38:
+         d5:cc:a6:ca:8e:ef:df:94:ab:32:5a:ec:32:84:01:7a:97:bb:
+         38:e0:a8:7d:20:d9:ca:51:3d:a3:74:f9:fe:85:14:26:95:37:
+         de:2d:74:7e:16:eb:14:14:1b:80:e9:12:54:de:cc:94:cc:38:
+         ca:df:9a:d0:ce:3e:6c:f1:de:e8:40:f5:3e:6e:c0:ee:05:50:
+         5a:38:4b:97:69:3c:7a:1f:a8:11:67:e5:9a:9e:50:2e:62:e8:
+         f8:bf:1a:54:84:ad:9d:0e:1e:ec:64:22:1b:38:85:87:0b:f3:
+         c7:47:80:aa:c1:99:72:a5:0d:fd:ce:2c:6e:0d:52:4d:d7:55:
+         2f:4e:52:6e:4a:b9:9a:61:34:08:59:d9:30:cc:30:4a:dc:35:
+         34:b9:b0:a4:97:a1:b8:d7:ce:ee:63:2d:3a:ad:73:9c:99:49:
+         11:0a:04:94:60:97:19:4f:4b:66:d4:fb:bf:14:46:39:27:da:
+         01:3f:d8:6a:46:cb:77:12:f2:77:86:3a:45:e1:f7:44:3d:2b:
+         3d:e6:26:06:5e:29:20:be:1f:aa:74:43:0c:85:79:e2:14:9c:
+         03:bf:49:21:64:7e:c3:4a:7b:a1:60:f6:ce:fb:7c:59:e4:65:
+         7c:fb:1e:84:38:53:ec:1f:80:c2:b5:f7:c2:0e:46:19:4b:4d:
+         a3:32:6e:59:40:32:9b:6b:2c:bb:fa:1a:89:2e:96:22:71:d5:
+         71:92:9b:0d:86:0e:60:60:19:ba:34:22:e1:f1:f3:c9:87:5c:
+         5c:f5:d3:52:1c:11:0d:d3:91:7a:6b:bd:6f:cc:ba:78:60:e0:
+         20:b4:c2:d1:91:70:5f:74:33:a1:bc:aa:db:d1:35:91:b5:cb:
+         46:a8:28:7a:26:fc:8c:6c:64:05:4d:73:f1:00:bb:eb:70:87:
+         fd:9f:04:55:8f:7b:00:b1:c0:50:09:3a:58:44:19:a7:bd:f1:
+         34:5b:4d:d9:10:6b:d5:38:fa:64:f5:d3:28:4f:c4:23:14:29:
+         98:3e:2f:c2:87:6f:69:a0:89:0e:ee:f7:c4:50:9e:33:b9:0a:
+         84:f0:c6:38:45:38:91:10:14:ac:c4:03:8e:4b:e2:61:f9:78:
+         85:02:b9:c6:d5:c2:9f:ba:ac:21:1a:3a:4e:1a:f8:a9:12:ae:
+         67:37:79:ce:ec:94:54:cf:28:c4:33:3b:45:23:d2:cb:37:3b:
+         09:ee:e2:c4:9f:12:dc:e3:8f:06:1d:d5:54:b7:73:2c:34:36:
+         97:41:91:81:30:06:2c:90:14:9b:aa:4e:33:2a:38:29:f5:3d:
+         f4:c7:f2:03:6d:d9:d7:3e
 -----BEGIN CERTIFICATE-----
-MIIElTCCA32gAwIBAgIBATANBgkqhkiG9w0BAQsFADBWMQ8wDQYDVQQDDAZjYWNl
+MIIGlTCCBH2gAwIBAgIBATANBgkqhkiG9w0BAQsFADBWMQ8wDQYDVQQDDAZjYWNl
 cnQxCzAJBgNVBAYTAkZJMREwDwYDVQQIDAhIZWxzaW5raTERMA8GA1UEBwwISGVs
-c2lua2kxEDAOBgNVBAoMB01hcmlhREIwHhcNMTkwMTI3MTAxMTEwWhcNMzkwMTIy
-MTAxMTEwWjCCAUcxCzAJBgNVBAYTAkZJMWEwXwYDVQQIDFhzdGF0ZSBvciBwcm92
+c2lua2kxEDAOBgNVBAoMB01hcmlhREIwHhcNMjAwMzAzMDMwMzAzWhcNNDAwMjI3
+MDMwMzAzWjCCAUcxCzAJBgNVBAYTAkZJMWEwXwYDVQQIDFhzdGF0ZSBvciBwcm92
 aW5jZSB3aXRoaW4gY291bnRyeSwgaW4gb3RoZXIgY2VydGlmaWNhdGVzIGluIHRo
 aXMgZmlsZSBpdCBpcyB0aGUgc2FtZSBhcyBMMUAwPgYDVQQHDDdsb2NhdGlvbiwg
 dXN1YWxseSBhbiBhZGRyZXNzIGJ1dCBvZnRlbiBhbWJpZ3VvdXNseSB1c2VkMTQw
 MgYDVQQKDCtvcmdhbml6YXRpb24gbmFtZSwgdHlwaWNhbGx5IGEgY29tcGFueSBu
 YW1lMUkwRwYDVQQLDEBvcmdhbml6YXRpb25hbCB1bml0IG5hbWUsIGEgZGl2aXNp
 b24gbmFtZSB3aXRoaW4gYW4gb3JnYW5pemF0aW9uMRIwEAYDVQQDDAlsb2NhbGhv
-c3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDrfE9Z8EA37Tiy6DBp
-TpXJAFnRYDuKqiihIEDuvxzzsKZAjlekeYHJcJ+MPfRcsPlYVdlisktp4RpzvwMO
-i8rTDfIS6mgeuPW6KQKwFX92Upp97m1+LPVa0IynyVPYjM7jvse7Sq58+fFtB6w7
-Vc2DPeTvlo6pyRzLhJnPN/VTV+eUeJcSBB/cMfjwv3yb74olAh8bq835vane3+E9
-svuSRJNZq/fCpuEFGUn7+AJdPtBQJlvjJqz7z6vxUgoSNhY9tZ4S88Np4puJcLIx
-VpqbkaTGOQFW5LWLNXBO60UbcH0aUi+lNzKArlDQ2kqFajxm50GFyDrdJdhMMoXL
-EryBAgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wg
-R2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBQLGGFmjxJEgWANgNYKap7e
-12lWsDAfBgNVHSMEGDAWgBTKcZmJ8HKrdWa7ZWoDBHKle5WmkzANBgkqhkiG9w0B
-AQsFAAOCAQEArGsVfWh0nc7i7YCc9ja1VItgONPNQ1yXRBvIbXPiHWpoB7/EDL+u
-ufESKBsHbYYujU0cVj7n12Khot6bexqKtH928c/TtbCVkc5+SUUPEaaWa3tCB8yN
-KBPSMBlawzEW9gqa182Ob76MqpFAaPpN/58Q1j0nJ1T3ZPp6idlnS2Mr2syV8TAQ
-6F7NzkPJcq0ytgbMqQLdTZwAl/yZgIS/41Ra6CylszCOMMs8X3QYQ6NCNlN4Yk8I
-VhGAwhIa2nAYEH89FbRzKSZpfTvs+BgB96zCj/I3jY38eIe81MsdwRTHnDvcqf3o
-hioyUf6Nic1qnXpvDFJLsk3T3AI5jS0lbg==
+c3QwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDJ+UYnaWhLWibdH5gP
+RLpAg8qCwnpTzLkw8co+4m3eOhGqzsWQJ+bzTzvprxrsIdfKFB/xm8vNfle0yF1s
+zVpU3YqaqSfvSdNsrJkt3OXAHjwFn8UExy2BZiEnFtbD5JdT2yGmQ1Bwyy6V+9pS
+VScbF+8Zg+v/ofxiY+ov/lM15tm8Ay3lwhixKZHkpHks8QXd1T//sZ5kjWApdEPw
+PTHneM6fF3Tln/t7aalFO+h2A8bKUoWEUA0rmG//2EFmbTn2GqNh4oJf3OzKl9yy
+3M+ql+8TEOr7j5mRu9noYSUtaASvL4lWDYmQd+CtwiXrPNJOPcpurjXI8pR6CXTT
+jnMw5jn+tpzHTSNOsL+QlymyszCyu0muRwn+zSM6AaSsy1MldJgnIIVrGHS7HL//
+BdwGfAJ4gR6WrY/Gog2zXI6t1f2vxY2LnzGxT6cem81XaNWt7U57Xw0M0keFtGVL
+IxxbpeyI+kKAc4TLdQWmOfHmqU4V5i/3YQvzCMymKytkbgSh/NpeNK18VL6F5O1k
+dDEwKu2rPtLNxz7eGASKp72tUnQTsbB9TX6He8uCHykR4Q5LQiuD6Ih+koAg6+7a
+1N0enFRcZ6cAX6G3v13AWiUqwR58kzLdF8gCbRpCJvZQAUvfKX9y8ZBygIq6L4yG
+fVZFxQ6CFtgpA1eHziIcfzGoTwIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG
++EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQU
+29+LvMLuqSpO/Q56XxXPlKMMyswwHwYDVR0jBBgwFoAUTfx6GfMrDH32wHxN+HI0
+TIw1UnQwDQYJKoZIhvcNAQELBQADggIBAAnRrw4L6KJeyO4KnyHDLNqkONXMpsqO
+79+UqzJa7DKEAXqXuzjgqH0g2cpRPaN0+f6FFCaVN94tdH4W6xQUG4DpElTezJTM
+OMrfmtDOPmzx3uhA9T5uwO4FUFo4S5dpPHofqBFn5ZqeUC5i6Pi/GlSErZ0OHuxk
+Ihs4hYcL88dHgKrBmXKlDf3OLG4NUk3XVS9OUm5KuZphNAhZ2TDMMErcNTS5sKSX
+objXzu5jLTqtc5yZSREKBJRglxlPS2bU+78URjkn2gE/2GpGy3cS8neGOkXh90Q9
+Kz3mJgZeKSC+H6p0QwyFeeIUnAO/SSFkfsNKe6Fg9s77fFnkZXz7HoQ4U+wfgMK1
+98IORhlLTaMybllAMptrLLv6GokuliJx1XGSmw2GDmBgGbo0IuHx88mHXFz101Ic
+EQ3TkXprvW/Munhg4CC0wtGRcF90M6G8qtvRNZG1y0aoKHom/IxsZAVNc/EAu+tw
+h/2fBFWPewCxwFAJOlhEGae98TRbTdkQa9U4+mT10yhPxCMUKZg+L8KHb2mgiQ7u
+98RQnjO5CoTwxjhFOJEQFKzEA45L4mH5eIUCucbVwp+6rCEaOk4a+KkSrmc3ec7s
+lFTPKMQzO0Uj0ss3Ownu4sSfEtzjjwYd1VS3cyw0NpdBkYEwBiyQFJuqTjMqOCn1
+PfTH8gNt2dc+
 -----END CERTIFICATE-----
diff --git a/mysql-test/std_data/server-key.pem b/mysql-test/std_data/server-key.pem
index 125c4efa587..20b64cac257 100644
--- a/mysql-test/std_data/server-key.pem
+++ b/mysql-test/std_data/server-key.pem
@@ -1,27 +1,51 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIIEpQIBAAKCAQEA63xPWfBAN+04sugwaU6VyQBZ0WA7iqoooSBA7r8c87CmQI5X
-pHmByXCfjD30XLD5WFXZYrJLaeEac78DDovK0w3yEupoHrj1uikCsBV/dlKafe5t
-fiz1WtCMp8lT2IzO477Hu0qufPnxbQesO1XNgz3k75aOqckcy4SZzzf1U1fnlHiX
-EgQf3DH48L98m++KJQIfG6vN+b2p3t/hPbL7kkSTWav3wqbhBRlJ+/gCXT7QUCZb
-4yas+8+r8VIKEjYWPbWeEvPDaeKbiXCyMVaam5GkxjkBVuS1izVwTutFG3B9GlIv
-pTcygK5Q0NpKhWo8ZudBhcg63SXYTDKFyxK8gQIDAQABAoIBAADaATt1B/Zr0DGt
-b0diNl50tt5v96cnuF/kyvdSD5u9/svq99wraFG/K4SJUNHo/e3Y2aFmvakTXFIg
-1bT+wmwC9+YjnN7HknPq5AyY904JPG/KJfE33mdGq8uLidcVo0XlkblWqsze5oWb
-an8Ib2bTGXnYVIm+pXEC+L9sF2IGxJP3kWQyFjX1UEp7YDhmtMVm7ONeli3/LPYF
-TqWF6ScoI0AexKVo7Jgfx+oDlUASSup90Om07YyjlbIzgiTYPzDqM9XhDQNDaMLJ
-zi3N4INohRRG0R/DQ4nqP/YWat6/q1FuRznWdOzzNIR5YrbyFRgX7rMPCjeF3cRt
-mK9xKXECgYEA+Qo7ixk0giXZj2ZkJ/OsqT2CnK1jUuJGxtyGCpXbM7hXe8bRq8AA
-BVVzLIFR5wY1LKoLYxoMSAn3B1F7y2iVgj7VlBehLTWC2mrsrPse1yRSl8TGOpJB
-wP40lfH6/L2mXI4TfnDEgfzkFdpgsHVazpz48A5nSKB+xrJX4JkDos0CgYEA8hEa
-GBvwqYum/tMWhYF0YVPXxRUySMYRZX9cW7Mfa/bG2KUyCwIJJipiBe/Zq2AsN917
-wA1TXdnwC3i63iVssPxKKkx1RNpDpNJKzot9oawjhR/OKG/24f6mQJ1W8cX7viT8
-F7IXIX4/drfuDlz4s89NmMRaKuC/mWJfYi77yIUCgYEAkvIUvDi9IOZQfyq9gk1n
-3dyriuNMLgXSGVjZxrkxxEzLYf+ojB0YZg1LjkEoIJcrHRWg7nLaOE+Y8TqFPzqQ
-rW+B+oYO1mwyr8pTqKXsRqnqCh9TkA/ouIXGZYuIu0T0OryiiALmEIU12Cco0jYM
-xMkeohb9nn8FDx0AeUgQOykCgYEArpehL4Rvd4ovf5p2owJ1E4Hqnc6k/xJFF+Td
-k5JFdpR+ZWH5DzF/sdRd8RRG9jGekwifqiyyVX3Mgimo9nMdyyWcxJdy+Z9HrMi0
-hfbcPVCwKeN/yXDAK86E0RPq0uVOpp18agbcYh7x3UnaXOe3xdEekbIFqumBqDro
-uyNSHRUCgYEAy3xDAESUEXhYGN4WRpWn58Pb0NUsbc/l9P42Z7tog7YmPLpJuY1O
-qKW3uwTzxmk65JsiBEsOL7UT7xbq15uaUINC3FRfcMQz7+TW8rUBguVRUjxLTHlx
-SlgU3Oxz1oQ/J7GL+x0MxBtTjRW9/7Adv2j1Du8QtlWgr/wOHarPjh4=
+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
 -----END RSA PRIVATE KEY-----
diff --git a/mysql-test/std_data/server-new-cert.pem b/mysql-test/std_data/server-new-cert.pem
index fb203d7c0a2..14a732495bc 100644
--- a/mysql-test/std_data/server-new-cert.pem
+++ b/mysql-test/std_data/server-new-cert.pem
@@ -2,34 +2,51 @@ Certificate:
     Data:
         Version: 3 (0x2)
         Serial Number: 2 (0x2)
-    Signature Algorithm: sha256WithRSAEncryption
+        Signature Algorithm: sha256WithRSAEncryption
         Issuer: CN=cacert, C=FI, ST=Helsinki, L=Helsinki, O=MariaDB
         Validity
-            Not Before: Jan 27 10:11:10 2019 GMT
-            Not After : Jan 23 10:11:10 2039 GMT
+            Not Before: Mar  3 03:03:03 2020 GMT
+            Not After : Feb 28 03:03:03 2040 GMT
         Subject: C=FI, ST=Helsinki, L=Helsinki, O=MariaDB, CN=server-new
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
+                RSA Public-Key: (4096 bit)
                 Modulus:
-                    00:d8:52:35:3e:4b:0e:fe:cc:17:1f:b8:79:5c:35:
-                    d6:a0:e3:c5:11:23:5b:12:7f:c3:a4:4d:0f:35:71:
-                    e1:94:87:49:11:e2:f4:b3:80:dc:33:c0:65:f4:1b:
-                    24:21:b1:c4:e5:d6:b8:1e:83:f6:3f:6b:7f:aa:2a:
-                    18:a0:49:6c:87:ee:b4:df:cc:58:19:0f:7f:06:b3:
-                    93:ce:8c:de:46:69:80:e9:ac:9e:79:05:bd:e2:c6:
-                    bc:80:3f:44:7e:a8:ca:09:72:e3:e4:b0:a4:54:79:
-                    08:9c:f8:b0:ed:56:3b:21:da:dd:8b:06:12:df:fb:
-                    b6:2e:0e:ca:27:c4:de:8b:55:e2:93:d6:ff:09:aa:
-                    f0:a9:8e:83:be:92:fb:9d:a8:c4:b6:27:e2:63:03:
-                    3c:0d:6b:4a:05:f9:6f:1c:14:de:f3:c3:ef:60:9f:
-                    b4:21:d6:74:6f:a3:a5:6a:c0:b0:4e:7b:37:95:0d:
-                    f6:43:06:95:cf:c0:93:13:d0:81:83:5a:aa:bf:81:
-                    98:ca:4f:70:46:79:42:84:12:32:74:e4:7f:4e:84:
-                    13:83:54:15:49:45:1d:d1:40:bf:e1:5f:11:de:94:
-                    d0:4a:5e:8b:a2:26:03:61:55:41:45:86:45:00:d8:
-                    ea:34:f7:1f:21:64:f7:85:6b:a6:47:3e:f9:81:e4:
-                    a6:6b
+                    00:bb:a2:d6:cc:2d:ff:d1:91:03:41:0a:d9:e8:78:
+                    cd:f7:6c:b7:8a:b0:37:e7:a2:79:c3:4e:08:da:f2:
+                    ec:bd:ba:83:e8:e9:3d:56:56:8e:d3:b8:d7:f2:b4:
+                    95:99:39:26:a5:b2:92:b0:09:5d:42:ee:61:06:45:
+                    9c:e6:c6:f4:7a:ee:45:5f:bb:4b:29:1d:f2:1d:4b:
+                    64:16:ca:c3:0c:58:95:1a:db:d4:54:f4:2d:d7:84:
+                    76:69:75:cc:b1:a4:0b:4c:83:d5:ba:9f:f5:d0:d7:
+                    58:b9:ed:35:da:b5:d1:88:1e:85:db:94:b7:2b:f3:
+                    b7:a1:85:73:dc:92:b8:bb:80:79:85:e2:7e:d6:f6:
+                    bb:72:fe:8c:65:64:35:99:8a:d9:74:c6:86:ef:ad:
+                    61:cb:50:ff:1c:44:72:a0:42:c6:8f:19:60:ab:8f:
+                    00:3b:6f:94:ae:be:88:70:72:61:80:4d:68:4f:c6:
+                    54:9c:d6:a4:e3:85:a8:51:4f:76:dc:b1:5b:4b:c2:
+                    ac:07:ec:12:4d:c8:ba:c7:b0:80:ef:57:00:75:4f:
+                    b0:fa:c2:a1:70:4d:0d:75:c6:a9:3d:b8:1f:5b:fd:
+                    0c:34:84:5c:4f:10:35:62:90:7b:d5:6b:b7:78:cd:
+                    54:e2:13:ba:9f:81:c2:f1:84:e3:74:b3:27:46:4a:
+                    ef:48:59:75:58:53:a9:92:e0:c8:3e:44:86:72:f0:
+                    67:64:1a:72:db:33:68:bb:51:a4:39:9c:30:f4:38:
+                    9f:c1:74:ab:57:6b:99:3b:e7:19:34:96:44:2b:f3:
+                    7b:58:82:b7:eb:eb:74:5a:66:8e:be:68:2b:71:85:
+                    01:b4:d5:0d:e0:1e:17:5f:e1:12:72:f3:71:d8:41:
+                    9a:4e:be:a4:2c:bb:80:48:e9:2d:74:1e:57:12:d0:
+                    90:c2:66:2d:1c:d1:7c:c7:e0:5d:7f:a0:a7:46:fb:
+                    31:a7:37:c7:19:22:4f:f6:7f:8d:b8:d4:9b:f7:b1:
+                    fa:6f:77:68:b2:e2:a1:e4:05:e9:22:79:09:f0:59:
+                    21:c0:49:0e:1c:31:0e:3d:f4:1d:4e:d5:51:8f:e4:
+                    40:66:a6:a0:63:0c:dc:66:5b:08:d6:6c:ee:2b:08:
+                    7f:1e:a8:ac:10:69:8f:78:49:5e:8e:20:f1:81:c8:
+                    b2:6a:36:4a:43:e2:0f:47:7b:8f:ba:06:52:2a:2d:
+                    05:c0:03:f7:11:ed:ed:c1:e8:48:9c:3f:c1:cf:2c:
+                    88:c8:57:de:81:e3:59:2e:db:51:6e:23:0d:7e:a8:
+                    75:a4:6d:cd:9e:56:7f:19:f9:43:ee:2b:3a:dd:c5:
+                    af:e9:1a:3e:1d:dc:57:a3:dd:56:14:ed:ff:33:40:
+                    0f:c3:e9
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Basic Constraints: 
@@ -37,45 +54,70 @@ Certificate:
             Netscape Comment: 
                 OpenSSL Generated Certificate
             X509v3 Subject Key Identifier: 
-                20:CD:11:1F:57:C3:33:FC:17:16:2D:32:48:16:47:B8:0F:42:2D:53
+                41:73:D1:5E:AA:7D:59:3C:6F:4D:43:E8:20:AE:A1:D3:9C:26:B1:C4
             X509v3 Authority Key Identifier: 
-                keyid:CA:71:99:89:F0:72:AB:75:66:BB:65:6A:03:04:72:A5:7B:95:A6:93
+                keyid:4D:FC:7A:19:F3:2B:0C:7D:F6:C0:7C:4D:F8:72:34:4C:8C:35:52:74
 
     Signature Algorithm: sha256WithRSAEncryption
-         b3:2d:b3:4f:a0:9a:48:ec:a9:06:97:8d:b4:af:93:13:a8:58:
-         8f:4e:43:f1:4f:7b:13:59:d5:c6:dc:f0:f7:b8:f2:e8:47:28:
-         e0:94:2d:cb:d1:de:58:a8:31:e7:41:f1:c3:9b:6e:21:c4:3e:
-         2c:56:f7:8b:36:1e:b5:c9:40:aa:15:8b:32:33:29:e6:8e:3c:
-         a2:db:ad:02:c2:cb:46:fa:4d:2b:43:51:97:00:bc:ad:83:b1:
-         e9:69:7b:83:31:a8:ce:18:c9:a2:d3:a2:17:f5:f4:b2:3c:59:
-         36:2d:6d:ee:21:bd:fa:24:cd:c5:96:26:41:66:6b:8a:ba:ff:
-         25:60:44:64:43:f5:4d:df:61:4d:a1:7f:16:27:63:a4:9c:61:
-         fc:d1:9e:9f:aa:e0:dd:dd:4f:64:2e:89:03:cd:a7:f4:b8:d0:
-         d7:a5:72:46:fa:33:13:84:0f:a2:e1:fa:9a:a1:e4:6f:f4:30:
-         fb:30:24:df:ac:d0:52:94:8d:92:3b:26:fe:1d:a0:30:da:23:
-         05:3f:ef:f1:79:a8:b7:f9:73:42:5f:da:9d:f8:a8:28:b8:4f:
-         e3:6e:50:81:46:e1:b4:a1:7e:ec:78:10:8c:be:2e:bc:21:6d:
-         1a:78:df:3f:f9:a8:8e:67:0e:b6:cb:1e:fd:ed:d3:28:68:59:
-         e3:d4:59:a8
+         49:7c:18:c2:1b:5b:de:5e:15:84:18:f6:6b:1c:03:d6:8e:75:
+         34:f6:6c:0c:e3:64:60:65:6e:19:1d:26:3b:c8:ed:96:99:30:
+         19:7e:3d:d9:c5:a1:19:8e:c6:15:c1:60:74:7e:b6:8b:78:d8:
+         46:43:f7:ad:b0:96:fa:51:4e:52:c2:67:da:da:a8:70:f3:40:
+         c5:80:b4:cc:36:18:81:98:d2:af:94:bc:82:ba:4a:7e:e6:d6:
+         a3:4b:2b:6f:f6:45:b3:82:07:2b:32:68:7a:d5:fc:7d:70:75:
+         7b:4e:b6:33:4c:3d:c2:46:3b:89:c8:77:d8:8d:da:20:88:1d:
+         0c:76:2a:79:92:9c:91:44:44:c8:c7:5e:53:8c:d3:29:f6:e9:
+         3e:26:9f:47:ac:ca:03:4a:90:ba:c7:ba:0e:31:61:fe:89:af:
+         2b:eb:07:aa:7d:10:fd:f5:f0:ba:09:f0:58:1b:86:9b:d2:0b:
+         b8:c8:db:f4:be:6c:ba:96:dd:3c:5d:7f:ec:4b:8e:93:46:b4:
+         78:d2:c7:02:c7:26:e5:d9:ba:3d:93:3f:85:ea:bc:3a:ab:54:
+         bf:d5:2c:6a:49:f4:d7:d4:72:cd:5d:33:d2:cf:c8:c6:98:1e:
+         d2:de:72:53:8c:c3:47:f7:43:aa:ca:0f:ca:0f:24:d0:7a:0f:
+         43:fa:9c:cc:2a:39:2b:0f:ee:89:91:91:6b:e7:89:80:fd:bf:
+         87:c2:9f:0a:7d:f5:e1:33:72:8e:02:35:d4:c6:ec:1d:e7:e0:
+         f2:9b:ff:c3:d0:f2:ae:52:9a:41:87:65:24:d4:2e:3d:61:fb:
+         ef:6d:9a:e9:b2:09:af:6b:d9:72:1a:c5:e7:45:1f:4d:bb:2a:
+         9e:af:25:b8:cd:d0:fc:43:70:45:55:a0:23:4e:23:00:de:65:
+         dc:f6:bb:d9:a3:b3:61:28:5c:10:09:c1:ca:d5:63:4d:cb:e0:
+         1b:36:e1:e6:4c:25:1f:c2:00:d2:93:1f:c4:c9:64:b0:0d:dd:
+         fb:dd:b4:0a:57:24:8a:d5:20:c3:d2:54:a3:c3:8e:c1:e7:c4:
+         fe:30:14:dc:f2:69:6c:8b:67:1f:2b:a7:90:bb:da:f7:81:0d:
+         33:24:3a:21:d6:5d:7f:ed:9a:b1:99:47:8e:42:53:f4:e1:86:
+         da:15:c3:88:bf:e6:4e:29:48:b3:bf:2e:ac:ef:b9:04:74:2f:
+         48:b7:13:ef:fa:92:a5:93:99:e1:0e:3b:86:d1:3b:f9:49:b0:
+         ad:b9:e4:88:e6:db:10:58:5e:b3:61:bf:5c:74:ef:a0:76:99:
+         2e:0f:b8:68:01:9e:32:ae:af:cf:14:45:af:45:0a:f0:b7:f9:
+         41:3b:45:52:7b:a0:44:eb
 -----BEGIN CERTIFICATE-----
-MIIDpjCCAo6gAwIBAgIBAjANBgkqhkiG9w0BAQsFADBWMQ8wDQYDVQQDDAZjYWNl
+MIIFpjCCA46gAwIBAgIBAjANBgkqhkiG9w0BAQsFADBWMQ8wDQYDVQQDDAZjYWNl
 cnQxCzAJBgNVBAYTAkZJMREwDwYDVQQIDAhIZWxzaW5raTERMA8GA1UEBwwISGVs
-c2lua2kxEDAOBgNVBAoMB01hcmlhREIwHhcNMTkwMTI3MTAxMTEwWhcNMzkwMTIz
-MTAxMTEwWjBaMQswCQYDVQQGEwJGSTERMA8GA1UECAwISGVsc2lua2kxETAPBgNV
+c2lua2kxEDAOBgNVBAoMB01hcmlhREIwHhcNMjAwMzAzMDMwMzAzWhcNNDAwMjI4
+MDMwMzAzWjBaMQswCQYDVQQGEwJGSTERMA8GA1UECAwISGVsc2lua2kxETAPBgNV
 BAcMCEhlbHNpbmtpMRAwDgYDVQQKDAdNYXJpYURCMRMwEQYDVQQDDApzZXJ2ZXIt
-bmV3MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2FI1PksO/swXH7h5
-XDXWoOPFESNbEn/DpE0PNXHhlIdJEeL0s4DcM8Bl9BskIbHE5da4HoP2P2t/qioY
-oElsh+6038xYGQ9/BrOTzozeRmmA6ayeeQW94sa8gD9EfqjKCXLj5LCkVHkInPiw
-7VY7IdrdiwYS3/u2Lg7KJ8Tei1Xik9b/CarwqY6DvpL7najEtifiYwM8DWtKBflv
-HBTe88PvYJ+0IdZ0b6OlasCwTns3lQ32QwaVz8CTE9CBg1qqv4GYyk9wRnlChBIy
-dOR/ToQTg1QVSUUd0UC/4V8R3pTQSl6LoiYDYVVBRYZFANjqNPcfIWT3hWumRz75
-geSmawIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NM
-IEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUIM0RH1fDM/wXFi0ySBZH
-uA9CLVMwHwYDVR0jBBgwFoAUynGZifByq3Vmu2VqAwRypXuVppMwDQYJKoZIhvcN
-AQELBQADggEBALMts0+gmkjsqQaXjbSvkxOoWI9OQ/FPexNZ1cbc8Pe48uhHKOCU
-LcvR3lioMedB8cObbiHEPixW94s2HrXJQKoVizIzKeaOPKLbrQLCy0b6TStDUZcA
-vK2Dselpe4MxqM4YyaLTohf19LI8WTYtbe4hvfokzcWWJkFma4q6/yVgRGRD9U3f
-YU2hfxYnY6ScYfzRnp+q4N3dT2QuiQPNp/S40Nelckb6MxOED6Lh+pqh5G/0MPsw
-JN+s0FKUjZI7Jv4doDDaIwU/7/F5qLf5c0Jf2p34qCi4T+NuUIFG4bShfux4EIy+
-LrwhbRp43z/5qI5nDrbLHv3t0yhoWePUWag=
+bmV3MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAu6LWzC3/0ZEDQQrZ
+6HjN92y3irA356J5w04I2vLsvbqD6Ok9VlaO07jX8rSVmTkmpbKSsAldQu5hBkWc
+5sb0eu5FX7tLKR3yHUtkFsrDDFiVGtvUVPQt14R2aXXMsaQLTIPVup/10NdYue01
+2rXRiB6F25S3K/O3oYVz3JK4u4B5heJ+1va7cv6MZWQ1mYrZdMaG761hy1D/HERy
+oELGjxlgq48AO2+Urr6IcHJhgE1oT8ZUnNak44WoUU923LFbS8KsB+wSTci6x7CA
+71cAdU+w+sKhcE0NdcapPbgfW/0MNIRcTxA1YpB71Wu3eM1U4hO6n4HC8YTjdLMn
+RkrvSFl1WFOpkuDIPkSGcvBnZBpy2zNou1GkOZww9DifwXSrV2uZO+cZNJZEK/N7
+WIK36+t0WmaOvmgrcYUBtNUN4B4XX+EScvNx2EGaTr6kLLuASOktdB5XEtCQwmYt
+HNF8x+Bdf6CnRvsxpzfHGSJP9n+NuNSb97H6b3dosuKh5AXpInkJ8FkhwEkOHDEO
+PfQdTtVRj+RAZqagYwzcZlsI1mzuKwh/HqisEGmPeElejiDxgciyajZKQ+IPR3uP
+ugZSKi0FwAP3Ee3twehInD/BzyyIyFfegeNZLttRbiMNfqh1pG3NnlZ/GflD7is6
+3cWv6Ro+HdxXo91WFO3/M0APw+kCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgB
+hvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYE
+FEFz0V6qfVk8b01D6CCuodOcJrHEMB8GA1UdIwQYMBaAFE38ehnzKwx99sB8Tfhy
+NEyMNVJ0MA0GCSqGSIb3DQEBCwUAA4ICAQBJfBjCG1veXhWEGPZrHAPWjnU09mwM
+42RgZW4ZHSY7yO2WmTAZfj3ZxaEZjsYVwWB0fraLeNhGQ/etsJb6UU5Swmfa2qhw
+80DFgLTMNhiBmNKvlLyCukp+5tajSytv9kWzggcrMmh61fx9cHV7TrYzTD3CRjuJ
+yHfYjdogiB0Mdip5kpyRRETIx15TjNMp9uk+Jp9HrMoDSpC6x7oOMWH+ia8r6weq
+fRD99fC6CfBYG4ab0gu4yNv0vmy6lt08XX/sS46TRrR40scCxybl2bo9kz+F6rw6
+q1S/1SxqSfTX1HLNXTPSz8jGmB7S3nJTjMNH90Oqyg/KDyTQeg9D+pzMKjkrD+6J
+kZFr54mA/b+Hwp8KffXhM3KOAjXUxuwd5+Dym//D0PKuUppBh2Uk1C49YfvvbZrp
+sgmva9lyGsXnRR9NuyqeryW4zdD8Q3BFVaAjTiMA3mXc9rvZo7NhKFwQCcHK1WNN
+y+AbNuHmTCUfwgDSkx/EyWSwDd373bQKVySK1SDD0lSjw47B58T+MBTc8mlsi2cf
+K6eQu9r3gQ0zJDoh1l1/7ZqxmUeOQlP04YbaFcOIv+ZOKUizvy6s77kEdC9ItxPv
++pKlk5nhDjuG0Tv5SbCtueSI5tsQWF6zYb9cdO+gdpkuD7hoAZ4yrq/PFEWvRQrw
+t/lBO0VSe6BE6w==
 -----END CERTIFICATE-----
diff --git a/mysql-test/std_data/server-new-key.pem b/mysql-test/std_data/server-new-key.pem
index 40f6138157d..05f0e5451d6 100644
--- a/mysql-test/std_data/server-new-key.pem
+++ b/mysql-test/std_data/server-new-key.pem
@@ -1,27 +1,51 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/mysql-test/std_data/server8k-cert.pem b/mysql-test/std_data/server8k-cert.pem
index a2878516020..dfbf05bc3f4 100644
--- a/mysql-test/std_data/server8k-cert.pem
+++ b/mysql-test/std_data/server8k-cert.pem
@@ -2,85 +2,85 @@ Certificate:
     Data:
         Version: 3 (0x2)
         Serial Number: 3 (0x3)
-    Signature Algorithm: sha256WithRSAEncryption
+        Signature Algorithm: sha256WithRSAEncryption
         Issuer: CN=cacert, C=FI, ST=Helsinki, L=Helsinki, O=MariaDB
         Validity
-            Not Before: Jan 27 10:11:15 2019 GMT
-            Not After : Jan 22 10:11:15 2039 GMT
+            Not Before: Mar  3 03:03:03 2020 GMT
+            Not After : Feb 27 03:03:03 2040 GMT
         Subject: C=FI, ST=Helsinki, L=Helsinki, O=MariaDB, CN=server8k
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (8192 bit)
+                RSA Public-Key: (8192 bit)
                 Modulus:
-                    00:b9:f5:78:46:53:e0:3c:07:bf:97:fb:ab:be:97:
-                    71:d5:89:44:bf:db:0e:58:be:96:42:06:9e:dc:08:
-                    f7:51:d6:27:7f:65:2d:c7:1e:f7:4c:5b:3f:e5:7a:
-                    f8:fd:df:73:42:92:0f:37:5e:28:ae:51:14:13:be:
-                    b3:55:d4:db:9a:f6:a9:88:84:02:79:fb:f9:c4:67:
-                    f9:96:99:68:80:58:4a:22:c4:a1:90:c0:33:58:c8:
-                    96:d1:a4:7f:7f:9e:84:a6:f3:03:a3:01:93:cb:1d:
-                    ab:f1:f5:17:28:03:34:78:6d:47:46:07:ab:f8:ea:
-                    ff:02:8a:f8:20:92:a2:ce:29:6a:66:d0:39:87:2f:
-                    62:9f:43:d9:a3:0b:74:89:ab:f7:d9:39:7d:6c:de:
-                    05:4e:58:4d:35:15:d4:18:2d:ea:70:df:60:fc:50:
-                    f8:0d:b5:8e:c0:c6:03:74:3b:8d:53:d6:87:a2:9a:
-                    b6:0a:5a:80:a5:cc:df:30:a7:95:30:ad:50:62:e1:
-                    01:3a:8e:ee:e1:41:b4:99:ee:ce:8b:ca:55:24:3e:
-                    7c:00:79:08:f4:46:42:e0:63:93:a3:d0:5a:39:fc:
-                    7e:f4:96:21:24:9a:f7:29:0d:22:85:b6:c5:c9:9c:
-                    92:71:68:5b:03:de:fb:bc:75:f8:0f:24:ea:01:92:
-                    b7:37:e0:78:a0:64:37:69:90:8a:7c:99:c7:45:f9:
-                    90:a2:50:59:e1:1c:02:ad:b2:2e:c7:3b:26:ec:76:
-                    6d:10:c9:f9:2f:dc:12:87:41:72:08:ec:0a:1c:ae:
-                    9b:6f:de:57:a4:aa:b9:ee:83:a4:14:c4:e5:54:66:
-                    32:5d:21:2a:a3:6d:2d:8d:f5:8e:08:a2:a3:0d:07:
-                    83:4b:0a:27:0b:9c:7f:73:78:f8:d9:9c:1e:d4:33:
-                    2b:a7:35:b4:77:5e:12:d6:a6:a4:d2:d0:af:30:b6:
-                    d5:1f:05:9b:1e:e6:ae:c8:a5:8c:b6:b7:dc:c3:0b:
-                    1a:85:5a:d5:bd:be:65:c8:e6:a5:f0:37:38:16:d2:
-                    b0:ca:ff:2e:a1:f2:7f:8e:28:c5:9c:d4:de:be:1f:
-                    23:43:51:85:f9:e5:fb:a8:61:61:96:50:34:ad:75:
-                    34:fa:46:e9:2a:66:1a:43:9c:e4:e5:79:26:b7:0b:
-                    5d:d1:1d:81:c6:52:17:d7:95:13:9e:65:64:9b:2d:
-                    0d:2b:7a:04:28:aa:02:df:81:0c:f3:83:3d:76:ad:
-                    40:e6:f8:c0:b2:f3:0a:b2:cc:e8:f2:c8:ac:21:c4:
-                    90:7d:4c:b6:50:d8:b7:0a:15:12:5f:a5:e0:c5:68:
-                    8f:ed:4d:f4:d9:b5:72:df:63:c9:d6:14:fe:d8:fc:
-                    db:31:72:1e:15:d5:e8:ac:d9:a7:d2:0a:bc:a7:a6:
-                    51:5f:0d:0f:23:20:2d:34:ba:44:66:f6:81:e3:aa:
-                    fe:38:11:61:ec:03:3f:64:6f:93:f5:2d:b0:be:7d:
-                    6f:49:73:c6:23:67:7b:46:da:62:67:10:e4:e6:a1:
-                    e4:1b:50:0f:ff:50:51:0a:dc:ee:1b:e3:ed:20:30:
-                    3a:c1:37:17:24:96:fa:fe:2e:d0:75:b3:9b:c1:ae:
-                    15:ac:ba:fe:b4:d5:33:ff:33:86:f3:5e:24:f7:45:
-                    8d:ad:b0:47:6a:ef:9c:0e:f7:07:0e:71:a0:e7:75:
-                    4a:42:59:02:b7:11:86:d6:65:77:06:3a:f5:6f:99:
-                    3b:9b:52:cf:e6:30:59:e3:28:19:8e:c2:5f:e1:f7:
-                    28:74:ff:c2:d1:35:91:96:ed:52:14:4a:3c:91:19:
-                    50:7b:3e:04:65:f8:3e:d9:6c:29:cf:74:d8:0f:df:
-                    e4:cd:94:73:81:ef:19:9e:4b:0c:3e:2e:24:fd:a9:
-                    c6:73:b5:7c:ed:d1:0e:72:ac:c9:fe:5e:a6:2d:d7:
-                    7f:ca:c5:75:18:cb:3e:27:62:20:cf:10:c1:7f:d3:
-                    6f:a9:d4:78:98:3b:f6:0c:e0:5f:54:b3:0b:0a:36:
-                    d7:59:34:c3:70:5c:59:25:cf:54:e0:7f:ec:a3:3b:
-                    c4:a1:6f:be:1e:be:e1:36:c6:d3:26:bd:86:ae:0e:
-                    73:26:89:3c:7f:72:a1:2d:00:66:b1:e2:e0:74:72:
-                    86:12:c2:6b:e4:e7:99:70:bb:98:81:c3:44:65:c5:
-                    76:21:62:f1:af:31:aa:73:be:fb:b0:86:a6:5b:e2:
-                    51:78:e6:6a:1b:58:3f:4a:34:e6:99:88:e4:1c:b1:
-                    80:94:f2:31:a0:b0:27:81:b1:18:98:6f:53:2e:74:
-                    a0:c3:2d:e7:f6:92:27:80:40:a4:f3:3a:e2:ad:84:
-                    64:82:ed:80:3f:e0:54:e8:3d:ec:75:25:21:2a:2f:
-                    4f:08:61:be:b6:e0:fb:bd:ec:7e:3b:17:d2:a4:bb:
-                    b8:f8:3f:9a:2e:12:eb:b2:00:45:51:3a:99:53:6e:
-                    b5:06:5e:8b:8f:0a:b5:61:2c:12:10:60:4d:2c:de:
-                    6e:e8:80:f8:99:b2:8b:36:61:33:88:08:60:4f:30:
-                    ff:61:d2:cc:02:75:5d:d7:8d:06:e0:bd:e3:e0:35:
-                    f7:ba:f8:a6:e4:14:79:e4:62:4d:bf:ea:81:fe:1e:
-                    01:24:69:da:89:1a:c1:11:3c:50:f1:a3:b3:27:df:
-                    cc:16:3a:03:97:88:a4:92:63:a6:8e:c9:18:f5:02:
-                    16:a7:b2:a5:3d:f7:12:00:e4:e1:55:96:16:84:6e:
-                    03:70:3d:ce:4b
+                    00:ac:74:31:9c:0a:92:45:8a:ef:01:fe:fd:3e:7e:
+                    c5:33:0b:e8:0f:af:8e:91:ff:6a:99:eb:df:88:4f:
+                    8e:5e:07:52:6c:c3:1c:55:2c:c0:23:e4:7b:ba:8d:
+                    c1:df:b8:1c:54:ce:3e:0e:d8:b9:37:66:48:8c:7d:
+                    6d:9d:9b:1c:b9:10:39:4e:f4:3d:64:96:93:be:3e:
+                    98:dd:c1:79:c7:bb:56:45:50:bb:ce:75:cd:39:1c:
+                    fa:42:b9:f0:a6:ed:9a:ca:ef:5f:41:db:3d:83:de:
+                    c0:51:6e:0e:82:31:f7:f8:97:53:b0:b3:74:1a:62:
+                    69:1e:71:7e:dc:e6:bd:de:41:2f:b3:98:a0:c4:d4:
+                    d9:7c:8b:c2:40:4a:63:bb:c0:5e:bc:0e:b9:53:34:
+                    11:57:4f:0d:23:c4:86:92:34:cb:55:cb:06:53:19:
+                    d5:51:b0:44:52:24:e8:03:a0:13:d8:3c:8a:b3:b9:
+                    bc:0c:c1:f9:53:98:6d:8a:4e:9a:68:74:a2:b9:a5:
+                    21:e7:27:77:ec:4b:b6:99:14:e8:d3:0b:d6:88:cf:
+                    1e:ef:2e:53:c7:06:ee:a4:4d:42:e0:db:70:47:59:
+                    ef:be:55:2a:b6:bb:e7:34:bf:10:fb:4d:71:90:12:
+                    3f:6e:3a:2e:83:88:5a:8d:46:17:96:43:f0:dd:f5:
+                    90:d6:1e:6b:bb:b2:17:06:38:b5:b6:1c:b8:1f:b8:
+                    3d:96:82:6a:a6:28:10:d8:08:07:2e:fa:4f:de:3f:
+                    6d:d6:e5:e5:e7:4f:f0:ef:83:d5:be:46:c2:3f:0a:
+                    f1:1c:79:d1:5b:dd:89:69:a2:82:40:7d:39:3f:95:
+                    5b:9c:72:d7:e7:ef:6b:fb:00:47:f0:02:90:47:b5:
+                    ab:7a:76:15:3e:bd:8c:1d:bb:db:b4:cf:92:d8:c7:
+                    fe:50:cc:d2:25:76:0a:f3:dd:01:95:dc:9b:51:f7:
+                    8a:39:82:e3:ce:ef:76:5f:4d:e1:bf:fe:5b:91:1b:
+                    71:91:b7:42:71:4a:7b:a1:96:d6:5a:5c:e1:09:3c:
+                    17:db:37:f4:8e:87:f5:54:18:65:3c:f3:6d:9f:91:
+                    7b:40:80:3b:04:cb:23:70:83:a8:65:03:97:0e:38:
+                    01:56:37:80:9b:47:be:8e:44:61:27:ec:19:52:a1:
+                    05:fb:ac:15:df:c7:df:11:70:a6:41:95:62:d5:c9:
+                    02:2e:36:01:61:95:25:f7:d4:02:c9:39:54:43:72:
+                    5f:7a:57:5f:ff:ae:b7:f8:43:09:88:ea:f1:8a:ce:
+                    e3:96:1f:70:94:3b:4b:59:07:78:a1:8e:72:0b:dc:
+                    03:4a:31:35:a3:e8:06:e3:c6:8b:94:bd:da:6f:2f:
+                    ac:62:e1:54:01:57:1d:d4:3b:de:98:50:91:b9:de:
+                    f2:6b:2d:ec:bc:bb:87:f2:60:c5:34:70:b0:d6:97:
+                    50:10:02:d9:f4:d8:c6:02:65:24:31:6d:08:06:98:
+                    51:ac:f9:66:9a:4f:3c:3f:d9:78:8f:6e:6e:1d:80:
+                    fd:3a:9c:22:2e:57:23:62:3d:66:38:9a:79:ef:f3:
+                    a4:fa:ac:10:6c:ba:32:6e:39:1b:cc:84:fb:46:48:
+                    f0:b5:97:5d:ff:83:d3:ea:58:9e:f4:0b:bc:80:fb:
+                    4d:50:58:f8:73:9a:9e:5a:2e:0f:e6:c3:22:fc:22:
+                    d2:f0:78:54:54:34:92:79:e0:fd:6b:ea:c0:b3:9a:
+                    7e:16:ea:2a:e0:ae:3b:30:2e:d1:1e:a6:53:78:92:
+                    c1:28:37:9a:cd:b0:8f:cb:e9:96:07:de:8b:19:ec:
+                    78:b6:de:22:01:70:bf:39:90:9f:21:0b:23:83:3c:
+                    6e:12:19:2e:df:e4:1d:51:37:37:f1:9f:d7:2b:90:
+                    a6:60:83:0d:d7:7c:24:aa:b9:e3:3d:88:f8:fe:09:
+                    16:fb:ed:80:77:1b:e1:6a:db:2a:dc:b8:d4:ba:4c:
+                    f0:0f:7a:d5:63:c0:c2:f5:98:2a:1e:96:be:65:d7:
+                    d1:62:3a:7f:c1:a8:87:dc:37:6a:e7:dc:d8:cc:38:
+                    e2:ce:60:73:d9:74:ec:98:d2:30:27:2f:e6:ad:60:
+                    fc:2d:b9:60:85:ed:9c:ce:20:68:20:f8:60:ad:8f:
+                    c3:0b:2d:27:19:69:79:c3:11:ef:de:1d:4b:f4:e9:
+                    ef:f3:9e:62:70:5c:22:e9:f4:f0:1b:52:e7:2f:53:
+                    f2:2f:6b:34:e2:60:36:9f:7d:b4:1e:93:e5:ae:95:
+                    35:b9:7b:8c:33:4c:1e:85:8c:35:4c:b2:02:c0:bf:
+                    db:4e:38:65:77:e5:de:93:68:d1:d9:41:f0:f5:b2:
+                    17:c2:67:e3:42:a4:1f:2f:cb:9e:e7:e8:be:52:6a:
+                    29:0d:75:85:9c:98:dd:ee:3b:c8:86:64:83:5d:b2:
+                    95:6b:a8:02:02:bf:8d:d6:60:ee:28:c6:02:3d:b5:
+                    0a:d6:bb:d1:e7:09:8b:81:62:83:66:93:99:39:4f:
+                    a5:4f:24:86:f8:d0:00:28:ed:49:33:86:cc:91:69:
+                    3c:2a:a6:2c:51:49:08:70:0a:48:08:f6:74:a3:d5:
+                    c6:c2:25:96:ec:e8:ca:a6:1d:51:62:c6:7d:66:1b:
+                    f7:de:d8:05:ac:3a:00:a0:3c:b8:e8:90:cb:7a:48:
+                    74:84:57:44:b6:86:53:4b:e8:eb:40:e3:0c:59:4f:
+                    2f:a7:26:51:ee:61:cd:3e:d0:23:2b:48:b7:f0:ec:
+                    bf:8f:3e:46:c9
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Basic Constraints: 
@@ -88,61 +88,80 @@ Certificate:
             Netscape Comment: 
                 OpenSSL Generated Certificate
             X509v3 Subject Key Identifier: 
-                74:34:B9:9A:5C:1A:27:83:BA:0D:05:F9:5B:5B:A6:F6:BB:1A:8C:E8
+                45:92:23:3A:5B:91:CD:25:17:BA:C9:4D:5D:C0:22:F5:B4:DB:2D:29
             X509v3 Authority Key Identifier: 
-                keyid:CA:71:99:89:F0:72:AB:75:66:BB:65:6A:03:04:72:A5:7B:95:A6:93
+                keyid:4D:FC:7A:19:F3:2B:0C:7D:F6:C0:7C:4D:F8:72:34:4C:8C:35:52:74
 
     Signature Algorithm: sha256WithRSAEncryption
-         e6:e4:75:22:6c:5c:ea:f3:3c:85:1e:3c:62:a4:9b:bc:52:49:
-         2a:dd:dd:7e:94:c9:1b:c9:7e:4f:f2:82:ce:68:a2:17:29:b7:
-         73:0b:39:33:ca:86:c4:51:ad:d9:18:e7:c2:42:b8:c3:a9:4c:
-         8f:54:24:79:f2:27:9e:5b:aa:e5:bc:36:eb:11:b5:91:4b:7b:
-         79:b9:41:b0:d9:72:53:fb:ad:67:7e:7a:7e:0d:06:9e:45:7e:
-         f6:5f:5b:c4:77:1d:d1:e5:d7:7f:8e:f6:64:2a:7e:14:87:f4:
-         b4:a4:13:50:47:f7:49:b2:ad:36:c0:27:15:eb:c0:91:f0:e0:
-         77:bc:93:f3:db:01:69:10:c0:9c:e1:5b:03:9b:1d:ac:3d:0c:
-         cc:65:24:93:d6:8d:dc:aa:d7:d5:74:7d:0b:2a:6c:ec:c1:ad:
-         2d:83:56:aa:28:94:9e:e2:54:98:1c:28:bd:45:63:e5:6a:00:
-         20:ab:41:83:31:05:8d:38:ea:bb:35:ad:3b:28:46:44:47:3d:
-         f6:88:2e:ac:46:73:8e:13:0d:8d:5c:44:2b:0a:e3:bb:27:e3:
-         ce:5b:f6:3c:fc:e4:86:95:0b:46:87:f7:89:ab:36:7b:3e:78:
-         1d:be:04:aa:fa:f0:2c:fd:a7:15:ea:1e:35:bf:3c:33:3c:b7:
-         b8:4f:1b:db
+         20:2f:6d:25:37:fd:33:fd:bf:24:61:29:fa:53:56:5d:dd:6e:
+         76:91:2b:95:a4:71:fc:ef:81:78:c1:60:b5:93:6c:40:5c:6d:
+         c6:bb:2a:00:fe:08:e9:10:a9:9d:c6:c6:35:88:67:e3:57:62:
+         a8:70:83:07:f8:36:38:00:81:51:3e:e1:3c:f1:3b:7d:04:96:
+         8d:0c:ca:bf:cc:39:a3:ff:d4:b5:f8:58:71:82:8f:96:9d:58:
+         0d:a9:36:ef:c2:c4:f1:17:86:d5:26:db:79:a0:17:e0:83:7c:
+         19:36:9a:29:c0:f2:d5:e6:d5:21:a7:1b:dd:b0:38:e4:d7:43:
+         ea:0c:93:3e:2d:02:37:85:99:3b:37:00:1e:44:d7:66:7d:ae:
+         38:0e:9e:2a:5a:26:93:91:e2:a5:fd:b9:1c:9c:51:f7:54:cf:
+         66:e2:2a:f3:84:9e:cc:b5:b2:55:ea:7d:72:89:af:4a:38:68:
+         fb:4b:0e:bb:09:bf:25:e2:00:c7:78:e3:ce:72:fc:51:a1:1c:
+         c0:89:77:1d:b7:41:cc:42:a2:9e:ff:37:43:42:70:e4:cd:ec:
+         5b:a6:ae:85:d0:09:2a:d8:68:64:37:3f:cf:dd:89:af:49:2c:
+         1d:d5:1a:01:5b:c8:1f:0e:da:f8:14:8c:be:b5:90:1b:82:35:
+         8e:7e:22:1a:60:1a:dc:19:81:a8:a3:55:1f:c2:62:43:af:85:
+         2d:96:5f:c1:9f:05:b1:91:bd:7c:bb:99:1e:5f:c3:0e:df:7b:
+         77:5a:16:ee:1f:8f:90:7a:91:9f:91:cb:63:1f:6b:f1:f8:29:
+         b2:0d:43:d3:af:2e:a1:af:19:08:fe:fc:06:b7:69:c3:1b:8c:
+         2e:da:9f:fa:92:ca:c4:d1:34:0d:1a:31:9e:be:d2:b4:4a:97:
+         75:40:62:bc:7e:57:36:80:a9:35:f9:db:ee:0b:e8:68:c4:dc:
+         92:8b:98:a5:34:04:c6:0b:ae:b7:eb:81:57:ce:27:b3:80:86:
+         40:2f:fc:e5:89:e2:3f:9e:a5:ec:94:f4:e3:13:0b:34:cb:83:
+         a0:ca:42:53:b4:57:59:72:61:9f:f2:8b:47:8e:74:d1:c1:d7:
+         18:bb:dd:dc:9a:29:17:04:74:c8:7f:dd:f8:c4:00:ce:8d:db:
+         2d:8c:53:55:8d:08:37:92:86:e3:0a:69:53:bb:c4:02:59:2a:
+         dd:a2:0c:d3:51:ba:5c:b2:2f:4a:ba:9d:ff:87:7d:f4:49:e3:
+         4f:4f:bb:91:9e:8b:02:a7:06:c1:d5:d5:3f:3b:fe:3c:69:5e:
+         32:87:76:78:66:1a:8a:43:2a:10:e4:48:b0:67:53:92:e0:76:
+         e7:de:d7:f6:04:9a:23:05
 -----BEGIN CERTIFICATE-----
-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
+MIIHpDCCBYygAwIBAgIBAzANBgkqhkiG9w0BAQsFADBWMQ8wDQYDVQQDDAZjYWNl
 cnQxCzAJBgNVBAYTAkZJMREwDwYDVQQIDAhIZWxzaW5raTERMA8GA1UEBwwISGVs
-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
+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
-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
-PngdvgSq+vAs/acV6h41vzwzPLe4Txvb
+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
 -----END CERTIFICATE-----
diff --git a/mysql-test/std_data/server8k-key.pem b/mysql-test/std_data/server8k-key.pem
index 2dba202dfa0..1d7e7e7e528 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 41d5241a389..5a2966b8409 100644
--- a/mysql-test/std_data/serversan-cert.pem
+++ b/mysql-test/std_data/serversan-cert.pem
@@ -1,72 +1,114 @@
 Certificate:
     Data:
         Version: 3 (0x2)
-        Serial Number: 1 (0x1)
+        Serial Number: 4 (0x4)
         Signature Algorithm: sha256WithRSAEncryption
         Issuer: CN=cacert, C=FI, ST=Helsinki, L=Helsinki, O=MariaDB
         Validity
-            Not Before: May  2 14:29:07 2019 GMT
-            Not After : Apr 27 14:29:07 2039 GMT
+            Not Before: Mar  3 03:03:03 2020 GMT
+            Not After : Feb 27 03:03:03 2040 GMT
         Subject: C=FI, ST=Helsinki, L=Helsinki, O=MariaDB, CN=server
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (2048 bit)
+                RSA Public-Key: (4096 bit)
                 Modulus:
-                    00:b1:17:08:8f:43:a3:00:01:98:3b:52:8f:0b:b0:
-                    13:4c:eb:df:37:0d:a3:2c:5b:38:8d:28:88:94:33:
-                    f3:04:0a:b2:1c:98:27:ec:76:9f:a2:f7:35:79:48:
-                    cc:55:1e:68:b4:a7:4d:40:0e:bd:d5:86:c0:e5:cc:
-                    cc:fa:41:5a:55:3f:79:59:28:6b:a2:ca:55:77:c9:
-                    3f:5e:c4:96:e1:8c:64:cc:c7:95:29:48:81:bf:a8:
-                    c0:d2:3a:6f:6d:a7:14:b5:ec:d8:b6:c1:d8:86:7f:
-                    7a:e9:83:c0:83:c3:e1:5a:30:dd:29:ec:85:68:d9:
-                    09:9a:75:eb:ab:5f:3d:b1:a3:4f:e2:de:54:35:56:
-                    9c:7d:8f:2a:4a:18:8d:34:05:05:b4:3b:5b:9e:df:
-                    40:20:ad:87:a3:6b:c1:f2:da:a3:65:ef:c4:cb:3c:
-                    24:68:43:23:e8:14:a7:c0:11:b7:5f:e9:e3:09:24:
-                    af:dd:ac:97:75:22:9e:15:b7:20:b0:82:b0:e1:0f:
-                    0f:41:fc:da:3b:76:0c:6b:f8:42:06:e2:9e:70:9a:
-                    ed:a1:73:23:58:5c:f1:98:18:42:42:d4:0f:2e:35:
-                    41:00:50:1d:15:e7:65:30:b5:db:72:7d:88:da:be:
-                    93:72:e3:65:14:fa:0d:23:98:d6:5c:a5:fc:bb:8a:
-                    8f:f9
+                    00:d5:1d:45:7c:8d:47:ef:86:cb:c2:46:3d:3e:77:
+                    00:36:b0:d6:2c:02:8c:d0:c1:6d:f9:89:62:2b:e1:
+                    30:c8:b5:1f:53:27:ee:b6:22:c9:bc:3a:33:6f:2e:
+                    65:79:09:16:07:ac:dc:0e:d8:25:9d:55:e9:a3:a1:
+                    f2:69:16:eb:93:a9:a2:82:ca:4a:30:c7:a8:56:b7:
+                    3d:b2:27:f7:a4:fe:0f:2c:15:79:a8:8f:74:1f:e5:
+                    34:be:1c:b5:33:85:04:3b:29:8d:e5:67:ae:9b:6b:
+                    95:1f:4d:9c:4d:7e:fd:51:19:04:47:22:da:4c:87:
+                    1c:e1:8f:12:95:86:1f:1c:ff:13:b2:46:14:d8:3d:
+                    03:96:ab:a6:e3:3e:cc:17:61:8a:9f:fe:e5:22:e2:
+                    be:38:2c:b4:68:9e:ff:d5:ba:98:94:08:78:50:7d:
+                    43:e0:e3:d3:de:ad:0d:1e:96:a7:7b:aa:72:c1:f1:
+                    fc:dc:44:03:8c:56:79:a2:22:db:49:7e:f5:08:c6:
+                    2e:4b:df:33:00:68:f1:50:ef:71:07:c7:d8:59:6f:
+                    54:ef:17:bd:5a:21:1e:4a:81:cd:f3:2a:09:aa:88:
+                    be:b3:c7:4f:16:80:83:08:bb:e3:b7:d2:5b:ef:b7:
+                    4b:cd:99:3e:cd:72:3b:72:04:49:a5:ae:71:7f:e8:
+                    e9:7e:8f:22:4e:f5:06:55:b5:d5:a0:c3:c4:2d:fa:
+                    cb:c0:52:2f:dc:15:08:cc:65:8e:0c:a9:60:57:d6:
+                    e8:24:a1:87:ec:c0:b7:88:8f:4b:ca:51:ad:ba:f3:
+                    5d:6a:42:d5:77:9b:ef:8b:3d:5e:31:e9:0f:8f:9e:
+                    a5:9f:59:bd:62:ed:8c:2b:44:15:92:7c:69:38:92:
+                    23:ce:d9:19:5f:ce:d5:c4:57:cd:85:66:a7:c8:dc:
+                    8f:7f:ce:d8:95:a6:a4:73:7c:23:7d:1b:fc:e6:0e:
+                    cc:83:2a:b6:cf:ee:8f:90:8d:0d:60:b9:ad:08:78:
+                    48:c7:e5:d3:0c:9c:78:95:b9:aa:b1:e1:57:a3:91:
+                    02:96:d7:1d:0f:75:92:0b:1d:95:1f:50:88:ee:92:
+                    92:5d:bb:69:36:9f:72:f2:4e:7a:a9:53:07:41:77:
+                    2d:00:85:24:0f:4e:1d:66:a4:ee:4a:21:5c:7f:60:
+                    05:1b:d5:1a:ef:7d:e6:49:68:5b:6f:64:6a:1d:6b:
+                    ef:c1:f5:c2:15:b2:25:7d:bd:93:49:ce:09:95:76:
+                    bd:17:ae:07:f6:8e:5b:11:a7:40:36:84:fe:f9:b5:
+                    5e:e5:17:c2:5d:0e:93:53:b1:df:11:d6:1a:08:06:
+                    d9:0f:25:54:f9:54:6d:61:a1:bd:94:a3:e0:3d:69:
+                    f1:16:ff
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Subject Alternative Name: 
                 IP Address:127.0.0.1, DNS:localhost
     Signature Algorithm: sha256WithRSAEncryption
-         7e:97:8a:e9:81:e7:c9:44:0d:a6:45:7c:f6:ae:12:f9:c3:3c:
-         2c:1f:de:aa:6b:1b:1a:09:ce:9d:d2:d7:5c:ab:32:98:91:1e:
-         f8:7d:63:7a:c0:d3:34:eb:3a:55:b2:cd:f5:99:5f:95:bb:3e:
-         52:1d:05:2d:06:26:08:d1:e8:59:09:61:64:67:70:6d:5b:94:
-         2b:b4:0c:59:88:bf:56:c8:fe:73:7f:47:e9:b0:e5:46:71:26:
-         73:5f:d2:a0:81:4a:67:43:7a:18:2a:81:5b:2a:90:a9:3e:7b:
-         73:6e:83:b5:55:06:75:d1:8c:d1:d8:ad:7c:6a:ce:48:00:dd:
-         c2:1d:b9:40:cd:91:2f:43:c4:d6:f4:79:5e:5c:83:23:87:a7:
-         38:3c:d8:49:81:d2:eb:49:c7:f0:5f:3d:6e:a0:38:75:ca:92:
-         ce:d5:a7:54:fc:0e:7e:f4:14:66:77:79:93:bb:92:56:ab:f3:
-         1b:3c:75:57:4f:2d:12:6d:99:5b:d0:b5:62:b7:1d:e3:5b:a9:
-         70:cd:58:41:77:a6:2c:6d:34:bd:11:13:7d:ca:51:3e:06:f5:
-         cb:d4:d5:11:64:b0:cc:30:2f:a5:62:d0:dd:2c:8c:66:3f:df:
-         2a:df:4d:56:99:5c:12:af:ee:92:e1:02:f6:ce:12:be:99:fa:
-         cc:0c:5c:af
+         ac:c4:e6:b0:79:a7:31:09:78:47:45:90:ee:8b:bd:01:83:79:
+         51:e8:d0:88:c8:ca:ee:78:44:f8:0d:18:07:58:ed:9e:ec:cc:
+         a1:fc:65:ca:85:92:5f:12:a0:c3:4e:9b:22:b1:de:5f:22:c8:
+         2c:68:58:a9:62:f3:90:e7:48:61:c1:5e:5e:d2:84:a9:54:ea:
+         6a:d4:be:65:cd:4d:7e:c3:d2:6a:ea:69:63:b8:97:b6:c5:30:
+         7d:6b:d3:ca:b4:b1:9d:cf:ef:18:e7:de:81:4f:70:d8:ec:91:
+         19:53:6c:2c:6e:2e:d6:ce:7c:48:a0:77:7b:af:95:0f:31:fe:
+         ff:1b:0e:06:1e:db:94:7b:44:11:58:53:06:b5:37:c5:5f:2b:
+         61:63:b7:ff:12:c4:fc:10:df:95:eb:22:fd:b5:cb:68:24:80:
+         af:fc:27:f0:ee:28:b7:99:c5:6a:ec:1c:16:25:35:23:9b:a7:
+         ed:b2:ed:ff:69:47:60:f4:35:8e:20:2d:48:9d:18:cd:81:bc:
+         33:98:76:78:de:5c:0c:40:9c:cb:0b:29:dc:2a:d2:77:a7:e4:
+         02:ff:92:70:6e:5c:9a:61:8a:a5:29:d2:f0:a2:17:da:cc:43:
+         cc:de:c8:8c:d1:30:74:32:4f:ea:a1:69:98:dd:3c:ef:18:f2:
+         eb:32:96:6f:26:d6:46:b5:5b:85:e8:22:e0:33:10:64:44:5f:
+         04:ed:5f:91:fe:83:23:b7:64:93:da:6b:05:f2:ef:aa:b8:1a:
+         b5:16:29:61:96:8d:fd:f1:09:49:b9:6d:bd:8f:13:58:a1:3d:
+         d9:0a:23:9e:a1:b0:a3:7c:4e:cb:4f:a6:1c:f8:6d:c4:06:47:
+         f6:3a:2b:29:87:dd:be:1c:95:5d:51:6c:a7:9d:a8:cf:fd:4c:
+         9c:b8:90:2b:fb:c5:01:f9:c1:74:79:52:be:bc:18:b7:63:ff:
+         64:2c:7c:a5:03:37:c5:01:6e:59:16:2e:b8:6c:ca:7a:b6:54:
+         e4:2d:07:cf:11:05:6d:d1:b7:32:8c:6a:8e:93:9a:0b:7b:37:
+         18:67:9d:75:2f:cd:ac:3b:da:7f:f7:06:a7:00:37:f2:d2:2b:
+         4c:4c:ce:a1:06:3c:be:ce:9b:a1:9f:7d:ea:7c:79:29:25:7a:
+         1e:97:84:68:0a:3b:c6:20:3e:dc:0b:c4:63:7d:f5:26:9e:e8:
+         23:a3:ce:17:65:86:29:3f:f4:dc:ba:5c:3b:2a:4a:ce:3d:23:
+         d9:e3:56:4d:c7:61:80:b5:72:ca:32:c9:16:f8:96:84:5d:07:
+         c7:a7:0b:99:32:9d:aa:38:12:cb:64:a8:af:45:c5:d9:6a:c2:
+         c1:e2:c8:44:14:0c:0d:0d
 -----BEGIN CERTIFICATE-----
-MIIDRTCCAi2gAwIBAgIBATANBgkqhkiG9w0BAQsFADBWMQ8wDQYDVQQDDAZjYWNl
+MIIFRTCCAy2gAwIBAgIBBDANBgkqhkiG9w0BAQsFADBWMQ8wDQYDVQQDDAZjYWNl
 cnQxCzAJBgNVBAYTAkZJMREwDwYDVQQIDAhIZWxzaW5raTERMA8GA1UEBwwISGVs
-c2lua2kxEDAOBgNVBAoMB01hcmlhREIwHhcNMTkwNTAyMTQyOTA3WhcNMzkwNDI3
-MTQyOTA3WjBWMQswCQYDVQQGEwJGSTERMA8GA1UECAwISGVsc2lua2kxETAPBgNV
+c2lua2kxEDAOBgNVBAoMB01hcmlhREIwHhcNMjAwMzAzMDMwMzAzWhcNNDAwMjI3
+MDMwMzAzWjBWMQswCQYDVQQGEwJGSTERMA8GA1UECAwISGVsc2lua2kxETAPBgNV
 BAcMCEhlbHNpbmtpMRAwDgYDVQQKDAdNYXJpYURCMQ8wDQYDVQQDDAZzZXJ2ZXIw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCxFwiPQ6MAAZg7Uo8LsBNM
-6983DaMsWziNKIiUM/MECrIcmCfsdp+i9zV5SMxVHmi0p01ADr3VhsDlzMz6QVpV
-P3lZKGuiylV3yT9exJbhjGTMx5UpSIG/qMDSOm9tpxS17Ni2wdiGf3rpg8CDw+Fa
-MN0p7IVo2QmadeurXz2xo0/i3lQ1Vpx9jypKGI00BQW0O1ue30AgrYeja8Hy2qNl
-78TLPCRoQyPoFKfAEbdf6eMJJK/drJd1Ip4VtyCwgrDhDw9B/No7dgxr+EIG4p5w
-mu2hcyNYXPGYGEJC1A8uNUEAUB0V52UwtdtyfYjavpNy42UU+g0jmNZcpfy7io/5
-AgMBAAGjHjAcMBoGA1UdEQQTMBGHBH8AAAGCCWxvY2FsaG9zdDANBgkqhkiG9w0B
-AQsFAAOCAQEAfpeK6YHnyUQNpkV89q4S+cM8LB/eqmsbGgnOndLXXKsymJEe+H1j
-esDTNOs6VbLN9Zlflbs+Uh0FLQYmCNHoWQlhZGdwbVuUK7QMWYi/Vsj+c39H6bDl
-RnEmc1/SoIFKZ0N6GCqBWyqQqT57c26DtVUGddGM0ditfGrOSADdwh25QM2RL0PE
-1vR5XlyDI4enODzYSYHS60nH8F89bqA4dcqSztWnVPwOfvQUZnd5k7uSVqvzGzx1
-V08tEm2ZW9C1Yrcd41upcM1YQXemLG00vRETfcpRPgb1y9TVEWSwzDAvpWLQ3SyM
-Zj/fKt9NVplcEq/ukuEC9s4Svpn6zAxcrw==
+ggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDVHUV8jUfvhsvCRj0+dwA2
+sNYsAozQwW35iWIr4TDItR9TJ+62Ism8OjNvLmV5CRYHrNwO2CWdVemjofJpFuuT
+qaKCykowx6hWtz2yJ/ek/g8sFXmoj3Qf5TS+HLUzhQQ7KY3lZ66ba5UfTZxNfv1R
+GQRHItpMhxzhjxKVhh8c/xOyRhTYPQOWq6bjPswXYYqf/uUi4r44LLRonv/VupiU
+CHhQfUPg49PerQ0elqd7qnLB8fzcRAOMVnmiIttJfvUIxi5L3zMAaPFQ73EHx9hZ
+b1TvF71aIR5Kgc3zKgmqiL6zx08WgIMIu+O30lvvt0vNmT7NcjtyBEmlrnF/6Ol+
+jyJO9QZVtdWgw8Qt+svAUi/cFQjMZY4MqWBX1ugkoYfswLeIj0vKUa26811qQtV3
+m++LPV4x6Q+PnqWfWb1i7YwrRBWSfGk4kiPO2RlfztXEV82FZqfI3I9/ztiVpqRz
+fCN9G/zmDsyDKrbP7o+QjQ1gua0IeEjH5dMMnHiVuaqx4VejkQKW1x0PdZILHZUf
+UIjukpJdu2k2n3LyTnqpUwdBdy0AhSQPTh1mpO5KIVx/YAUb1RrvfeZJaFtvZGod
+a+/B9cIVsiV9vZNJzgmVdr0Xrgf2jlsRp0A2hP75tV7lF8JdDpNTsd8R1hoIBtkP
+JVT5VG1hob2Uo+A9afEW/wIDAQABox4wHDAaBgNVHREEEzARhwR/AAABgglsb2Nh
+bGhvc3QwDQYJKoZIhvcNAQELBQADggIBAKzE5rB5pzEJeEdFkO6LvQGDeVHo0IjI
+yu54RPgNGAdY7Z7szKH8ZcqFkl8SoMNOmyKx3l8iyCxoWKli85DnSGHBXl7ShKlU
+6mrUvmXNTX7D0mrqaWO4l7bFMH1r08q0sZ3P7xjn3oFPcNjskRlTbCxuLtbOfEig
+d3uvlQ8x/v8bDgYe25R7RBFYUwa1N8VfK2Fjt/8SxPwQ35XrIv21y2gkgK/8J/Du
+KLeZxWrsHBYlNSObp+2y7f9pR2D0NY4gLUidGM2BvDOYdnjeXAxAnMsLKdwq0nen
+5AL/knBuXJphiqUp0vCiF9rMQ8zeyIzRMHQyT+qhaZjdPO8Y8usylm8m1ka1W4Xo
+IuAzEGREXwTtX5H+gyO3ZJPaawXy76q4GrUWKWGWjf3xCUm5bb2PE1ihPdkKI56h
+sKN8TstPphz4bcQGR/Y6KymH3b4clV1RbKedqM/9TJy4kCv7xQH5wXR5Ur68GLdj
+/2QsfKUDN8UBblkWLrhsynq2VOQtB88RBW3RtzKMao6Tmgt7NxhnnXUvzaw72n/3
+BqcAN/LSK0xMzqEGPL7Om6Gffep8eSkleh6XhGgKO8YgPtwLxGN99Sae6COjzhdl
+hik/9Ny6XDsqSs49I9njVk3HYYC1csoyyRb4loRdB8enC5kynao4EstkqK9Fxdlq
+wsHiyEQUDA0N
 -----END CERTIFICATE-----
diff --git a/mysql-test/std_data/serversan-key.pem b/mysql-test/std_data/serversan-key.pem
index 22387b3af7d..320202b3454 100644
--- a/mysql-test/std_data/serversan-key.pem
+++ b/mysql-test/std_data/serversan-key.pem
@@ -1,28 +1,52 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCxFwiPQ6MAAZg7
-Uo8LsBNM6983DaMsWziNKIiUM/MECrIcmCfsdp+i9zV5SMxVHmi0p01ADr3VhsDl
-zMz6QVpVP3lZKGuiylV3yT9exJbhjGTMx5UpSIG/qMDSOm9tpxS17Ni2wdiGf3rp
-g8CDw+FaMN0p7IVo2QmadeurXz2xo0/i3lQ1Vpx9jypKGI00BQW0O1ue30AgrYej
-a8Hy2qNl78TLPCRoQyPoFKfAEbdf6eMJJK/drJd1Ip4VtyCwgrDhDw9B/No7dgxr
-+EIG4p5wmu2hcyNYXPGYGEJC1A8uNUEAUB0V52UwtdtyfYjavpNy42UU+g0jmNZc
-pfy7io/5AgMBAAECggEAP6QHb3TfHyFzk94Xihu80+fwT9iWy1n8+L2YV6pTqyAs
-4hnMPy5iMC6nCO8gf3ZuKn31RRAHKLVEnVD8WPMjg39MHL5p8BbGoEWygFwl3OiX
-UQBomm10M2xx3xsg8EcbKkXzm7oOFke55DF0/eVnFwJ4eJiHWSamTNwT1YJkqXFt
-kbYxxcpvjzFKuIOFXMTbS6OHGLHjuuyWffxEkbvM/bU13IFmDOzahLFPihcz7rFu
-CaFN9JSSj4jENPkYOiw+zTtJhgOMCoclAcNc4c5Gs95wk6pTxoj9kHJaaYqinVgI
-owUTgIXRhuixjWJd1dylgY3YvrRFENZlMe39cVKwAQKBgQDppB7Qf2FmejMYtJkA
-WmlDSy+LZnYAAYjTqIeSAlRXI91iDa9HqrdPucQkv6nPvL6yndZYIrq50BLNGiL+
-v/3Ok/9v3H8jAiCzwIuqAYoA2gHh4d4ZV9Vxoqu6CcX/2xOUL7CSOV5NkK+3Yrs7
-n47X4ILGihIKzz5GoSTHyb6zRwKBgQDCCX1jwSEnIDhPCuid4+6g1vjTvVtgVIf9
-87sds02duE8K5Uwjio7g3BlV1YzLv0jKNkUK+HuG/c7n9r0IVrs4of6t/bJjl7vJ
-RLl6ZkSybzzS2x2nYk23VZlInYWUdJS9kHlic+mXfJvJvBBwyz8WX7t2wQaTqlDu
-QCpuV+HCvwKBgDz4/q2swG9s7o7A+rjT32qXYXYArES+IcYS0iZxgy8mhezD431R
-ePtOYHiyqA81k5KrjDd+ALrjKTTrYDyZQBQ8HUpFAczSDlS6p/ga5LfqLNmVB1AX
-0vUP3b70M/7cXlSqyWqvnAOkAadbFb+umSmPRrGncKPvh7II9b9J0AGbAoGAMyD3
-BnMcfkfSLpnMQ9aMyZr7xCeQTWjY0MUJmEDoAdhQE6nqDy9yiLPWhTSZPhLwZkA4
-nzRssFxuydbNZsYb3UdqaYSBHhccZ2ORkDwke/Qtzc3pGXMg0V9f3a+MRFsX2n+Y
-TKYIdl9iWZ0Ro/cab5XYOumQBxcI7k7AH4VOutcCgYEA3JgQiYoiPohS9A49bPiF
-eDX1Ck3lgaEF72us6BfvLHTrbA/qYhVUlrbrU2P/gAy1uKDRYq5RAoNGDLdwatvE
-0hPYj1hc1DuPAAGG83/tSh2jfFVbZBw5xEDjLerkpQyop59dfTS0E/oSu6ebxIIg
-dHEwqlmDrrJv7WwUJUzuUJU=
+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
+yYbWA0o6Gv9uVUkxkQEqb/NJh0xWMEk=
 -----END PRIVATE KEY-----