diff --git a/certs/test/server-badaltname.der b/certs/test/server-badaltname.der
index 6865f07a8..6c3b272d2 100644
Binary files a/certs/test/server-badaltname.der and b/certs/test/server-badaltname.der differ
diff --git a/certs/test/server-badaltname.pem b/certs/test/server-badaltname.pem
index 9044c63eb..eae252bec 100644
--- a/certs/test/server-badaltname.pem
+++ b/certs/test/server-badaltname.pem
@@ -2,12 +2,12 @@ Certificate:
     Data:
         Version: 3 (0x2)
         Serial Number:
-            01:f2:4d:b8:22:2c:16:8b:1e:eb:b2:f6:26:2c:4d:97:f7:71:78:be
+            2a:28:73:f4:22:96:4c:a2:52:a0:5f:54:72:35:38:8c:f7:49:98:9b
         Signature Algorithm: sha256WithRSAEncryption
         Issuer: C = US, ST = Montana, L = Bozeman, OU = Engineering, CN = www.nomatch.com, emailAddress = info@wolfssl.com
         Validity
-            Not Before: Dec 18 21:25:31 2024 GMT
-            Not After : Sep 14 21:25:31 2027 GMT
+            Not Before: Dec 18 23:11:23 2024 GMT
+            Not After : Sep 14 23:11:23 2027 GMT
         Subject: C = US, ST = Montana, L = Bozeman, OU = Engineering, CN = www.nomatch.com, emailAddress = info@wolfssl.com
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
@@ -39,27 +39,27 @@ Certificate:
                 B3:11:32:C9:92:98:84:E2:C9:F8:D0:3B:6E:03:42:CA:1F:0E:8E:3C
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        81:d2:b4:2d:ef:78:75:39:2b:20:f5:bd:26:50:9e:b5:23:f7:
-        c4:31:c9:7a:c2:6d:70:ce:cc:92:ba:c8:94:72:10:6a:a0:fb:
-        82:79:df:36:bf:03:1f:25:f4:f9:f8:de:6c:39:66:91:fa:71:
-        f2:fa:86:ed:2d:cc:a8:ab:c6:ee:fc:77:16:8f:0f:6a:6e:0f:
-        b4:32:16:46:0a:44:40:3e:51:af:bc:d2:48:fb:47:18:69:16:
-        c7:99:3e:12:24:71:9f:55:dd:10:76:88:dd:84:ee:12:19:6d:
-        40:0f:8e:95:30:d1:4c:e3:9c:9c:0c:91:b3:53:69:dd:1b:ee:
-        01:e9:99:d1:8a:8e:07:9a:85:e1:5f:d5:60:74:6c:41:bc:ef:
-        6f:d9:8d:27:55:d4:1f:01:c6:18:3c:36:ec:11:e6:d1:81:4c:
-        a6:19:69:26:72:7a:38:2a:a5:6c:9b:fa:95:6f:29:b2:7c:2a:
-        88:88:9b:58:16:f5:9d:43:d9:a1:3e:b5:44:f3:80:25:02:a5:
-        1e:09:ef:17:8a:ca:1d:b9:eb:cd:4a:fd:a4:c5:0a:4b:4e:73:
-        50:74:1b:42:d1:ae:bc:2f:44:00:9b:9c:ea:0c:d1:66:eb:fb:
-        fb:ce:47:48:5d:91:a7:3a:ee:39:9f:d6:38:54:5b:a7:13:44:
-        8c:6d:69:94
+        a0:80:d8:92:67:d6:c0:f0:21:39:cd:e9:66:56:bd:ce:76:95:
+        41:99:ca:4f:ed:5a:1f:c4:74:87:27:67:56:a6:15:39:65:2d:
+        1c:d7:04:99:2c:05:cf:b0:73:8a:19:63:5c:17:f6:07:e0:fd:
+        6d:35:bf:1e:99:7e:3b:7a:32:36:9f:df:cd:c0:1b:cb:95:57:
+        bb:d0:3a:5a:7b:ec:d5:1c:fc:72:64:05:c9:ae:1a:f3:77:1a:
+        04:c7:c5:b8:a8:d2:9e:8f:6c:40:50:af:d1:2a:07:23:5a:eb:
+        50:29:e7:48:27:9d:f5:d3:6c:1e:c8:21:e1:04:0c:0c:0e:95:
+        67:8c:9d:8c:c4:a5:be:50:fc:d6:76:12:cf:6d:fb:32:45:f5:
+        75:97:50:21:cd:57:c3:9c:20:18:38:a1:92:9e:2e:36:02:10:
+        c2:c3:a5:52:32:7e:d1:b6:98:86:d2:5b:63:b7:ef:0f:12:c4:
+        96:92:a7:ca:41:42:c0:dd:24:f5:e1:9f:68:bc:fc:ae:23:98:
+        0e:93:7b:52:ad:ff:e4:f4:45:af:9f:7b:5d:db:0b:60:fa:56:
+        62:3d:71:a2:52:59:51:87:4a:55:f6:bb:fb:04:bd:e1:3b:48:
+        a4:20:37:40:03:f6:56:6e:22:af:c9:89:3a:a7:d0:b4:80:e9:
+        4b:9c:e0:84
 -----BEGIN CERTIFICATE-----
-MIID0TCCArmgAwIBAgIUAfJNuCIsFose67L2JixNl/dxeL4wDQYJKoZIhvcNAQEL
+MIID0TCCArmgAwIBAgIUKihz9CKWTKJSoF9UcjU4jPdJmJswDQYJKoZIhvcNAQEL
 BQAwgYIxCzAJBgNVBAYTAlVTMRAwDgYDVQQIDAdNb250YW5hMRAwDgYDVQQHDAdC
 b3plbWFuMRQwEgYDVQQLDAtFbmdpbmVlcmluZzEYMBYGA1UEAwwPd3d3Lm5vbWF0
 Y2guY29tMR8wHQYJKoZIhvcNAQkBFhBpbmZvQHdvbGZzc2wuY29tMB4XDTI0MTIx
-ODIxMjUzMVoXDTI3MDkxNDIxMjUzMVowgYIxCzAJBgNVBAYTAlVTMRAwDgYDVQQI
+ODIzMTEyM1oXDTI3MDkxNDIzMTEyM1owgYIxCzAJBgNVBAYTAlVTMRAwDgYDVQQI
 DAdNb250YW5hMRAwDgYDVQQHDAdCb3plbWFuMRQwEgYDVQQLDAtFbmdpbmVlcmlu
 ZzEYMBYGA1UEAwwPd3d3Lm5vbWF0Y2guY29tMR8wHQYJKoZIhvcNAQkBFhBpbmZv
 QHdvbGZzc2wuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwJUI
@@ -70,10 +70,10 @@ Q7ilHFw0s64AoGPF9n8LWWh4c6aMGKkCba/DGQEuuBDjxsxAtGmjRjNph27Euxem
 Y3gPRDcwMpaAMiOVoXe6E9KXc+JdJclqDcM5YKS0sGlCQgnp2Ai8MyCzWCKnquvE
 4eZhg8XSlt/Z0E+t1wIDAQABoz0wOzAaBgNVHREEEzARgg93d3cubm9tYXRjaC5j
 b20wHQYDVR0OBBYEFLMRMsmSmITiyfjQO24DQsofDo48MA0GCSqGSIb3DQEBCwUA
-A4IBAQCB0rQt73h1OSsg9b0mUJ61I/fEMcl6wm1wzsySusiUchBqoPuCed82vwMf
-JfT5+N5sOWaR+nHy+obtLcyoq8bu/HcWjw9qbg+0MhZGCkRAPlGvvNJI+0cYaRbH
-mT4SJHGfVd0QdojdhO4SGW1AD46VMNFM45ycDJGzU2ndG+4B6ZnRio4HmoXhX9Vg
-dGxBvO9v2Y0nVdQfAcYYPDbsEebRgUymGWkmcno4KqVsm/qVbymyfCqIiJtYFvWd
-Q9mhPrVE84AlAqUeCe8XisoduevNSv2kxQpLTnNQdBtC0a68L0QAm5zqDNFm6/v7
-zkdIXZGnOu45n9Y4VFunE0SMbWmU
+A4IBAQCggNiSZ9bA8CE5zelmVr3OdpVBmcpP7VofxHSHJ2dWphU5ZS0c1wSZLAXP
+sHOKGWNcF/YH4P1tNb8emX47ejI2n9/NwBvLlVe70Dpae+zVHPxyZAXJrhrzdxoE
+x8W4qNKej2xAUK/RKgcjWutQKedIJ53102weyCHhBAwMDpVnjJ2MxKW+UPzWdhLP
+bfsyRfV1l1AhzVfDnCAYOKGSni42AhDCw6VSMn7RtpiG0ltjt+8PEsSWkqfKQULA
+3ST14Z9ovPyuI5gOk3tSrf/k9EWvn3td2wtg+lZiPXGiUllRh0pV9rv7BL3hO0ik
+IDdAA/ZWbiKvyYk6p9C0gOlLnOCE
 -----END CERTIFICATE-----
diff --git a/certs/test/server-badaltnull.der b/certs/test/server-badaltnull.der
index ccc04c1df..d7b1e3192 100644
Binary files a/certs/test/server-badaltnull.der and b/certs/test/server-badaltnull.der differ
diff --git a/certs/test/server-badaltnull.pem b/certs/test/server-badaltnull.pem
index 33e7b7e4e..121f47292 100644
--- a/certs/test/server-badaltnull.pem
+++ b/certs/test/server-badaltnull.pem
@@ -2,12 +2,12 @@ Certificate:
     Data:
         Version: 3 (0x2)
         Serial Number:
-            2e:ec:3d:cb:75:f8:c8:d1:48:8f:c3:b8:7f:0c:d9:ec:1c:e4:77:3c
+            5b:6e:37:ff:6f:59:9b:23:63:13:8f:d2:c3:a7:c6:8a:6a:14:92:31
         Signature Algorithm: sha256WithRSAEncryption
         Issuer: C = US, ST = Montana, L = Bozeman, OU = Engineering, CN = www.nomatch.com, emailAddress = info@wolfssl.com
         Validity
-            Not Before: Dec 18 21:25:31 2024 GMT
-            Not After : Sep 14 21:25:31 2027 GMT
+            Not Before: Dec 18 23:11:23 2024 GMT
+            Not After : Sep 14 23:11:23 2027 GMT
         Subject: C = US, ST = Montana, L = Bozeman, OU = Engineering, CN = www.nomatch.com, emailAddress = info@wolfssl.com
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
@@ -39,27 +39,27 @@ Certificate:
                 B3:11:32:C9:92:98:84:E2:C9:F8:D0:3B:6E:03:42:CA:1F:0E:8E:3C
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        67:9d:5e:c0:46:4f:57:f0:29:7f:6d:0c:df:9e:7a:51:a0:28:
-        79:03:b2:e8:39:3f:03:9e:d8:73:dd:56:78:bd:66:1d:c0:7b:
-        63:b5:da:06:86:4e:7e:94:cd:55:84:2d:14:28:9e:e2:48:5b:
-        1a:ac:b3:a4:78:56:57:08:44:c2:c6:1f:e1:6c:f9:6a:3c:cc:
-        d0:5e:63:7e:4e:8b:95:17:48:c1:80:73:2b:d4:91:aa:39:1e:
-        97:9f:20:ad:50:3a:51:66:c3:67:da:5a:3e:7e:7b:20:21:b3:
-        09:d5:4f:42:50:28:a4:17:20:e1:62:55:3e:dd:a6:fb:38:1e:
-        32:46:54:0e:ad:20:a5:1f:32:38:6a:82:13:b4:6b:ec:79:99:
-        46:05:54:e2:db:c4:c4:a3:41:ed:62:c8:3e:28:ec:14:fc:b2:
-        33:b6:a7:ae:db:c7:b3:51:ba:24:1e:dd:1b:de:e3:a0:f0:af:
-        66:29:00:3a:0d:b5:2e:45:15:fc:0f:14:36:06:34:ad:20:e3:
-        9b:de:91:63:fe:ba:98:61:87:37:65:17:90:12:2d:b0:0f:23:
-        1c:91:c9:98:ea:e8:0d:c6:85:c1:cb:d9:e8:c1:ff:cb:0b:34:
-        3b:0a:16:7b:c8:87:3f:3c:a8:5f:fe:9e:af:71:88:5d:cd:6c:
-        af:29:8b:ad
+        7b:28:fc:26:31:e7:6f:e7:da:82:ea:7e:e8:f4:f6:f4:23:fb:
+        c8:97:e9:c8:f2:25:50:f6:02:90:4c:ad:df:5d:9b:0e:02:e8:
+        93:94:30:88:0b:09:7d:fd:0f:90:2b:d1:06:b0:4f:96:1a:9e:
+        ca:1e:3b:13:97:96:3f:fe:b4:d7:73:bc:c3:ad:c3:31:90:c9:
+        85:87:63:1a:75:29:74:b5:3c:79:a7:5f:b8:83:16:98:03:a8:
+        9e:09:9c:91:97:67:78:ba:6b:96:f6:fa:fc:56:81:bc:3d:3e:
+        47:5f:01:c4:ad:e1:8d:65:24:ca:31:37:49:d0:cf:8e:cc:9e:
+        c6:3f:3e:b7:98:62:0c:6c:f0:01:8f:03:0b:79:06:69:1c:52:
+        7d:01:80:4e:09:b1:fb:80:64:19:76:bd:42:be:bf:59:85:e5:
+        70:88:a9:8d:19:19:e1:64:54:ed:71:1e:08:04:cf:64:23:e7:
+        6e:23:d1:5d:cc:46:3c:c2:00:14:dc:84:91:b5:bc:ae:e4:a1:
+        d0:f5:92:3f:9c:eb:28:02:cd:ca:e8:90:cd:68:41:20:a3:ed:
+        d3:73:99:ac:74:da:91:21:79:ca:5f:8d:d7:93:b6:14:66:8b:
+        f4:0f:bd:17:fd:9c:d6:40:e0:52:42:26:dd:45:f3:f5:7b:53:
+        14:7f:a5:08
 -----BEGIN CERTIFICATE-----
-MIIDzTCCArWgAwIBAgIULuw9y3X4yNFIj8O4fwzZ7BzkdzwwDQYJKoZIhvcNAQEL
+MIIDzTCCArWgAwIBAgIUW243/29ZmyNjE4/Sw6fGimoUkjEwDQYJKoZIhvcNAQEL
 BQAwgYIxCzAJBgNVBAYTAlVTMRAwDgYDVQQIDAdNb250YW5hMRAwDgYDVQQHDAdC
 b3plbWFuMRQwEgYDVQQLDAtFbmdpbmVlcmluZzEYMBYGA1UEAwwPd3d3Lm5vbWF0
 Y2guY29tMR8wHQYJKoZIhvcNAQkBFhBpbmZvQHdvbGZzc2wuY29tMB4XDTI0MTIx
-ODIxMjUzMVoXDTI3MDkxNDIxMjUzMVowgYIxCzAJBgNVBAYTAlVTMRAwDgYDVQQI
+ODIzMTEyM1oXDTI3MDkxNDIzMTEyM1owgYIxCzAJBgNVBAYTAlVTMRAwDgYDVQQI
 DAdNb250YW5hMRAwDgYDVQQHDAdCb3plbWFuMRQwEgYDVQQLDAtFbmdpbmVlcmlu
 ZzEYMBYGA1UEAwwPd3d3Lm5vbWF0Y2guY29tMR8wHQYJKoZIhvcNAQkBFhBpbmZv
 QHdvbGZzc2wuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwJUI
@@ -70,10 +70,10 @@ Q7ilHFw0s64AoGPF9n8LWWh4c6aMGKkCba/DGQEuuBDjxsxAtGmjRjNph27Euxem
 Y3gPRDcwMpaAMiOVoXe6E9KXc+JdJclqDcM5YKS0sGlCQgnp2Ai8MyCzWCKnquvE
 4eZhg8XSlt/Z0E+t1wIDAQABozkwNzAWBgNVHREEDzANggtsb2NhbGhvc3QAaDAd
 BgNVHQ4EFgQUsxEyyZKYhOLJ+NA7bgNCyh8OjjwwDQYJKoZIhvcNAQELBQADggEB
-AGedXsBGT1fwKX9tDN+eelGgKHkDsug5PwOe2HPdVni9Zh3Ae2O12gaGTn6UzVWE
-LRQonuJIWxqss6R4VlcIRMLGH+Fs+Wo8zNBeY35Oi5UXSMGAcyvUkao5HpefIK1Q
-OlFmw2faWj5+eyAhswnVT0JQKKQXIOFiVT7dpvs4HjJGVA6tIKUfMjhqghO0a+x5
-mUYFVOLbxMSjQe1iyD4o7BT8sjO2p67bx7NRuiQe3Rve46Dwr2YpADoNtS5FFfwP
-FDYGNK0g45vekWP+uphhhzdlF5ASLbAPIxyRyZjq6A3GhcHL2ejB/8sLNDsKFnvI
-hz88qF/+nq9xiF3NbK8pi60=
+AHso/CYx52/n2oLqfuj09vQj+8iX6cjyJVD2ApBMrd9dmw4C6JOUMIgLCX39D5Ar
+0QawT5YansoeOxOXlj/+tNdzvMOtwzGQyYWHYxp1KXS1PHmnX7iDFpgDqJ4JnJGX
+Z3i6a5b2+vxWgbw9PkdfAcSt4Y1lJMoxN0nQz47MnsY/PreYYgxs8AGPAwt5Bmkc
+Un0BgE4JsfuAZBl2vUK+v1mF5XCIqY0ZGeFkVO1xHggEz2Qj524j0V3MRjzCABTc
+hJG1vK7kodD1kj+c6ygCzcrokM1oQSCj7dNzmax02pEhecpfjdeTthRmi/QPvRf9
+nNZA4FJCJt1F8/V7UxR/pQg=
 -----END CERTIFICATE-----
diff --git a/certs/test/server-badcn.der b/certs/test/server-badcn.der
index a2ca12327..4aeb08c78 100644
Binary files a/certs/test/server-badcn.der and b/certs/test/server-badcn.der differ
diff --git a/certs/test/server-badcn.pem b/certs/test/server-badcn.pem
index 4b2bdb939..24be9f5ad 100644
--- a/certs/test/server-badcn.pem
+++ b/certs/test/server-badcn.pem
@@ -1,13 +1,13 @@
 Certificate:
     Data:
-        Version: 1 (0x0)
+        Version: 3 (0x2)
         Serial Number:
-            33:16:9a:42:80:de:79:6e:23:d1:12:d8:e9:fe:00:43:ab:92:e6:cf
+            5e:0c:68:fc:ee:45:c3:c4:93:92:92:1b:f0:6e:45:c8:a0:bd:e7:d2
         Signature Algorithm: sha256WithRSAEncryption
         Issuer: C = US, ST = Montana, L = Bozeman, OU = Engineering, CN = www.nomatch.com, emailAddress = info@wolfssl.com
         Validity
-            Not Before: Dec 18 21:25:31 2024 GMT
-            Not After : Sep 14 21:25:31 2027 GMT
+            Not Before: Dec 18 23:11:23 2024 GMT
+            Not After : Sep 14 23:11:23 2027 GMT
         Subject: C = US, ST = Montana, L = Bozeman, OU = Engineering, CN = www.nomatch.com, emailAddress = info@wolfssl.com
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
@@ -32,42 +32,45 @@ Certificate:
                     a7:aa:eb:c4:e1:e6:61:83:c5:d2:96:df:d9:d0:4f:
                     ad:d7
                 Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Subject Key Identifier: 
+                B3:11:32:C9:92:98:84:E2:C9:F8:D0:3B:6E:03:42:CA:1F:0E:8E:3C
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        5e:8f:7a:54:28:81:13:f7:91:2c:37:9a:b1:c5:52:6c:05:b7:
-        42:87:c6:92:10:4e:04:6f:6a:79:aa:46:07:2c:6b:2b:f6:03:
-        b5:80:ce:ed:77:d7:7a:6b:96:b7:b5:12:61:5e:f8:46:79:49:
-        b6:2e:95:7f:69:6c:b5:59:f0:1e:ee:9b:75:45:eb:02:e3:d9:
-        07:da:02:50:b2:36:f0:65:4d:df:6c:b7:a0:70:be:4d:f5:69:
-        fc:a9:c4:7f:b1:4f:7d:c1:34:4c:a2:6c:04:eb:20:0b:6a:c9:
-        52:77:20:57:26:9c:cc:3b:c2:02:d1:5e:e5:d2:6c:c3:33:c8:
-        84:3a:6d:99:e3:4e:c6:7d:fe:e1:cc:97:2a:9e:ea:6f:6e:6d:
-        b1:ef:5a:bd:fb:14:b8:2e:19:a7:b6:6b:7d:23:38:48:fb:ce:
-        67:88:bc:1c:f2:b7:e2:d2:bb:4d:2b:9a:5c:56:c9:80:20:16:
-        0c:e5:0f:b2:4d:9e:59:6a:9f:88:21:92:68:96:7c:49:91:c3:
-        10:67:7f:72:cc:37:a4:8f:c7:b2:ce:12:a1:1c:7c:b4:98:cc:
-        b4:81:8e:7a:d6:91:01:ee:99:54:94:29:e3:fb:03:bc:34:7a:
-        6c:77:1a:cd:a4:0f:6c:ed:9d:9b:8a:1f:76:1f:be:f8:09:7f:
-        d4:be:a2:67
+        81:71:e5:13:96:ab:99:46:c2:9e:8b:7c:b1:1c:96:08:f0:39:
+        fd:ad:85:ef:6f:54:60:6c:d4:ec:b4:65:69:3e:37:e3:c3:37:
+        ea:22:b8:79:ae:ba:b3:c4:29:8d:87:84:93:f4:74:81:7d:e6:
+        1d:2d:ee:37:86:4c:f2:a2:e8:b5:a7:ad:e4:c3:43:fa:9e:ff:
+        2b:d8:48:22:05:6c:e3:56:49:47:27:f6:3f:bb:45:5f:a2:25:
+        bc:24:3c:c6:16:57:3d:db:98:56:5c:47:a5:f7:ad:ee:0b:94:
+        f1:b8:5c:6a:5e:69:fc:a4:2e:b3:24:21:13:2b:0d:25:1b:2a:
+        ba:bb:e8:00:d2:80:59:e6:1f:01:f5:62:9d:70:84:04:dd:f2:
+        5f:ab:c0:6c:f8:75:37:e1:a4:14:df:ac:9c:ff:63:bd:70:92:
+        4a:c1:dd:2e:79:05:40:94:c4:92:2b:33:5d:aa:00:0f:d9:a1:
+        aa:48:79:4a:8b:c3:54:c4:cc:63:e6:4d:d6:cd:80:b2:77:6a:
+        63:16:6d:3b:47:63:e9:3d:41:e1:d2:d0:41:00:83:20:35:c6:
+        7d:36:5f:62:bf:a9:a1:a7:bf:c2:b4:44:9f:3c:f3:33:28:47:
+        01:bc:be:fb:4b:9c:81:4a:f8:81:b9:6f:cc:a4:81:95:79:24:
+        e7:06:6b:8e
 -----BEGIN CERTIFICATE-----
-MIIDjTCCAnUCFDMWmkKA3nluI9ES2On+AEOrkubPMA0GCSqGSIb3DQEBCwUAMIGC
-MQswCQYDVQQGEwJVUzEQMA4GA1UECAwHTW9udGFuYTEQMA4GA1UEBwwHQm96ZW1h
-bjEUMBIGA1UECwwLRW5naW5lZXJpbmcxGDAWBgNVBAMMD3d3dy5ub21hdGNoLmNv
-bTEfMB0GCSqGSIb3DQEJARYQaW5mb0B3b2xmc3NsLmNvbTAeFw0yNDEyMTgyMTI1
-MzFaFw0yNzA5MTQyMTI1MzFaMIGCMQswCQYDVQQGEwJVUzEQMA4GA1UECAwHTW9u
-dGFuYTEQMA4GA1UEBwwHQm96ZW1hbjEUMBIGA1UECwwLRW5naW5lZXJpbmcxGDAW
-BgNVBAMMD3d3dy5ub21hdGNoLmNvbTEfMB0GCSqGSIb3DQEJARYQaW5mb0B3b2xm
-c3NsLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMCVCOFXQfJx
-bbfSRUEnAWXGRa7yvCQwuJXOL07W9hyIvHyf+6hnf/5cnFF194rKB+c1L4/hvXvA
-L3yrZKgX/Mpde7rgIeVyLm8uhtiVc9qsG1O5Xz/XGQ0lT+FjY1GLC2Q/rUO4pRxc
-NLOuAKBjxfZ/C1loeHOmjBipAm2vwxkBLrgQ48bMQLRpo0YzaYduxLsXpvPo3a1z
-vHsvIbX9ZlEMvVSz4W1fHLwjc9EJA4kU0hC5ZMMq0KGWSrzh1Bpbx6DAwWN4D0Q3
-MDKWgDIjlaF3uhPSl3PiXSXJag3DOWCktLBpQkIJ6dgIvDMgs1gip6rrxOHmYYPF
-0pbf2dBPrdcCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAXo96VCiBE/eRLDeascVS
-bAW3QofGkhBOBG9qeapGByxrK/YDtYDO7XfXemuWt7USYV74RnlJti6Vf2lstVnw
-Hu6bdUXrAuPZB9oCULI28GVN32y3oHC+TfVp/KnEf7FPfcE0TKJsBOsgC2rJUncg
-VyaczDvCAtFe5dJswzPIhDptmeNOxn3+4cyXKp7qb25tse9avfsUuC4Zp7ZrfSM4
-SPvOZ4i8HPK34tK7TSuaXFbJgCAWDOUPsk2eWWqfiCGSaJZ8SZHDEGd/csw3pI/H
-ss4SoRx8tJjMtIGOetaRAe6ZVJQp4/sDvDR6bHcazaQPbO2dm4ofdh+++Al/1L6i
-Zw==
+MIIDtTCCAp2gAwIBAgIUXgxo/O5Fw8STkpIb8G5FyKC959IwDQYJKoZIhvcNAQEL
+BQAwgYIxCzAJBgNVBAYTAlVTMRAwDgYDVQQIDAdNb250YW5hMRAwDgYDVQQHDAdC
+b3plbWFuMRQwEgYDVQQLDAtFbmdpbmVlcmluZzEYMBYGA1UEAwwPd3d3Lm5vbWF0
+Y2guY29tMR8wHQYJKoZIhvcNAQkBFhBpbmZvQHdvbGZzc2wuY29tMB4XDTI0MTIx
+ODIzMTEyM1oXDTI3MDkxNDIzMTEyM1owgYIxCzAJBgNVBAYTAlVTMRAwDgYDVQQI
+DAdNb250YW5hMRAwDgYDVQQHDAdCb3plbWFuMRQwEgYDVQQLDAtFbmdpbmVlcmlu
+ZzEYMBYGA1UEAwwPd3d3Lm5vbWF0Y2guY29tMR8wHQYJKoZIhvcNAQkBFhBpbmZv
+QHdvbGZzc2wuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwJUI
+4VdB8nFtt9JFQScBZcZFrvK8JDC4lc4vTtb2HIi8fJ/7qGd//lycUXX3isoH5zUv
+j+G9e8AvfKtkqBf8yl17uuAh5XIuby6G2JVz2qwbU7lfP9cZDSVP4WNjUYsLZD+t
+Q7ilHFw0s64AoGPF9n8LWWh4c6aMGKkCba/DGQEuuBDjxsxAtGmjRjNph27Euxem
+8+jdrXO8ey8htf1mUQy9VLPhbV8cvCNz0QkDiRTSELlkwyrQoZZKvOHUGlvHoMDB
+Y3gPRDcwMpaAMiOVoXe6E9KXc+JdJclqDcM5YKS0sGlCQgnp2Ai8MyCzWCKnquvE
+4eZhg8XSlt/Z0E+t1wIDAQABoyEwHzAdBgNVHQ4EFgQUsxEyyZKYhOLJ+NA7bgNC
+yh8OjjwwDQYJKoZIhvcNAQELBQADggEBAIFx5ROWq5lGwp6LfLEclgjwOf2the9v
+VGBs1Oy0ZWk+N+PDN+oiuHmuurPEKY2HhJP0dIF95h0t7jeGTPKi6LWnreTDQ/qe
+/yvYSCIFbONWSUcn9j+7RV+iJbwkPMYWVz3bmFZcR6X3re4LlPG4XGpeafykLrMk
+IRMrDSUbKrq76ADSgFnmHwH1Yp1whATd8l+rwGz4dTfhpBTfrJz/Y71wkkrB3S55
+BUCUxJIrM12qAA/ZoapIeUqLw1TEzGPmTdbNgLJ3amMWbTtHY+k9QeHS0EEAgyA1
+xn02X2K/qaGnv8K0RJ888zMoRwG8vvtLnIFK+IG5b8ykgZV5JOcGa44=
 -----END CERTIFICATE-----
diff --git a/certs/test/server-badcnnull.der b/certs/test/server-badcnnull.der
index 89f97b2bc..c493efb53 100644
Binary files a/certs/test/server-badcnnull.der and b/certs/test/server-badcnnull.der differ
diff --git a/certs/test/server-badcnnull.pem b/certs/test/server-badcnnull.pem
index 3e3233c3c..8f35c0aa3 100644
--- a/certs/test/server-badcnnull.pem
+++ b/certs/test/server-badcnnull.pem
@@ -1,13 +1,13 @@
 Certificate:
     Data:
-        Version: 1 (0x0)
+        Version: 3 (0x2)
         Serial Number:
-            23:b5:9f:82:f2:9a:7a:ad:0e:93:75:bd:5f:80:fa:f6:1e:45:46:e7
+            17:94:c2:a9:62:50:9d:86:e1:29:9f:9b:fc:aa:fd:1c:ea:5f:d9:d2
         Signature Algorithm: sha256WithRSAEncryption
         Issuer: C = US, ST = Montana, L = Bozeman, OU = Engineering, CN = DER:30:0d:82:0b:6c:6f:63:61:6c:68:6f:73:74:00:68, emailAddress = info@wolfssl.com
         Validity
-            Not Before: Dec 18 21:25:31 2024 GMT
-            Not After : Sep 14 21:25:31 2027 GMT
+            Not Before: Dec 18 23:11:23 2024 GMT
+            Not After : Sep 14 23:11:23 2027 GMT
         Subject: C = US, ST = Montana, L = Bozeman, OU = Engineering, CN = DER:30:0d:82:0b:6c:6f:63:61:6c:68:6f:73:74:00:68, emailAddress = info@wolfssl.com
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
@@ -32,43 +32,47 @@ Certificate:
                     a7:aa:eb:c4:e1:e6:61:83:c5:d2:96:df:d9:d0:4f:
                     ad:d7
                 Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Subject Key Identifier: 
+                B3:11:32:C9:92:98:84:E2:C9:F8:D0:3B:6E:03:42:CA:1F:0E:8E:3C
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        b9:25:d3:2c:c8:09:92:6b:7f:00:9f:9c:ab:f2:96:ac:e7:76:
-        a3:0a:84:2b:e2:43:f0:b8:ee:17:8e:42:4e:8e:35:57:17:0c:
-        9c:ec:03:66:0d:ea:e8:d8:10:32:7a:6e:31:83:f8:b9:85:37:
-        a0:08:04:4d:87:5b:72:db:37:a7:4e:8a:e8:88:29:5d:4e:09:
-        81:b8:83:8c:9b:68:5d:4b:a5:f2:07:32:93:a4:28:bd:8b:bc:
-        54:fb:ef:40:59:11:fd:bd:57:20:13:79:37:c6:63:15:94:a4:
-        cd:2d:40:ae:bf:cb:97:43:82:a7:c8:1e:6f:81:58:5c:03:59:
-        20:3a:d8:b7:99:f0:5c:94:49:71:55:8e:10:83:fe:58:b4:b1:
-        fb:41:bf:ef:9b:b6:12:f5:91:e4:33:a9:95:0b:50:8c:48:77:
-        bd:45:16:8d:11:50:5a:85:71:9a:7a:b9:1b:e5:e3:e1:af:f0:
-        3d:fb:19:3a:ef:a5:e1:94:3b:aa:74:12:43:00:fe:27:1e:c5:
-        c4:c2:60:56:63:17:aa:69:39:7d:e0:95:74:7e:6e:b2:e3:75:
-        d3:a8:6c:b0:36:60:6d:f1:46:7d:ca:08:ad:54:6f:1f:1f:47:
-        1e:9f:2e:45:be:35:71:b5:97:aa:92:d4:f9:6c:e9:a9:b6:ce:
-        63:1a:86:1d
+        17:68:5d:de:f1:0e:17:a5:79:89:e1:75:ec:32:c7:91:92:19:
+        80:57:05:c7:ed:0d:ee:ba:62:79:d0:16:0e:68:82:69:65:c9:
+        f3:a7:d0:cc:88:8b:29:62:cd:b5:ba:ae:7b:9f:50:8f:5e:97:
+        94:ce:9c:b4:20:6c:0c:e7:8f:0a:b6:fd:42:36:a3:9f:da:c6:
+        ee:d4:0a:2b:ea:60:06:5f:1d:f2:e9:33:87:51:44:a2:15:c2:
+        8f:32:82:ef:ff:24:e5:8f:e7:23:98:1c:5c:22:c4:d7:27:12:
+        33:8e:ad:77:5b:35:d4:87:6e:c3:92:1b:df:a6:b3:df:66:16:
+        e0:d6:85:42:78:eb:b4:1a:0d:56:89:a5:e7:d4:db:b0:23:48:
+        c8:5f:a3:a7:c0:cc:46:40:96:3d:be:bb:b9:10:03:46:2d:67:
+        c8:e7:f1:6b:25:f3:ae:57:3d:dc:c8:06:1b:d3:8d:97:35:c1:
+        07:b9:0e:c1:26:a1:30:71:90:e8:79:84:8a:c6:36:8f:36:cc:
+        a5:0a:12:90:dd:19:a2:cc:e2:d6:c5:7d:53:b2:a5:86:fd:b8:
+        8f:bd:5f:6c:59:49:5a:ef:8b:d6:ac:d3:cc:ae:d7:6b:6a:fc:
+        f1:df:17:48:c0:11:42:a1:29:5e:3f:57:ed:2d:c1:b9:09:b5:
+        6e:dc:3f:3f
 -----BEGIN CERTIFICATE-----
-MIIDzzCCArcCFCO1n4LymnqtDpN1vV+A+vYeRUbnMA0GCSqGSIb3DQEBCwUAMIGj
-MQswCQYDVQQGEwJVUzEQMA4GA1UECAwHTW9udGFuYTEQMA4GA1UEBwwHQm96ZW1h
-bjEUMBIGA1UECwwLRW5naW5lZXJpbmcxOTA3BgNVBAMMMERFUjozMDowZDo4Mjow
-Yjo2Yzo2Zjo2Mzo2MTo2Yzo2ODo2Zjo3Mzo3NDowMDo2ODEfMB0GCSqGSIb3DQEJ
-ARYQaW5mb0B3b2xmc3NsLmNvbTAeFw0yNDEyMTgyMTI1MzFaFw0yNzA5MTQyMTI1
-MzFaMIGjMQswCQYDVQQGEwJVUzEQMA4GA1UECAwHTW9udGFuYTEQMA4GA1UEBwwH
-Qm96ZW1hbjEUMBIGA1UECwwLRW5naW5lZXJpbmcxOTA3BgNVBAMMMERFUjozMDow
-ZDo4MjowYjo2Yzo2Zjo2Mzo2MTo2Yzo2ODo2Zjo3Mzo3NDowMDo2ODEfMB0GCSqG
-SIb3DQEJARYQaW5mb0B3b2xmc3NsLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAMCVCOFXQfJxbbfSRUEnAWXGRa7yvCQwuJXOL07W9hyIvHyf+6hn
-f/5cnFF194rKB+c1L4/hvXvAL3yrZKgX/Mpde7rgIeVyLm8uhtiVc9qsG1O5Xz/X
-GQ0lT+FjY1GLC2Q/rUO4pRxcNLOuAKBjxfZ/C1loeHOmjBipAm2vwxkBLrgQ48bM
-QLRpo0YzaYduxLsXpvPo3a1zvHsvIbX9ZlEMvVSz4W1fHLwjc9EJA4kU0hC5ZMMq
-0KGWSrzh1Bpbx6DAwWN4D0Q3MDKWgDIjlaF3uhPSl3PiXSXJag3DOWCktLBpQkIJ
-6dgIvDMgs1gip6rrxOHmYYPF0pbf2dBPrdcCAwEAATANBgkqhkiG9w0BAQsFAAOC
-AQEAuSXTLMgJkmt/AJ+cq/KWrOd2owqEK+JD8LjuF45CTo41VxcMnOwDZg3q6NgQ
-MnpuMYP4uYU3oAgETYdbcts3p06K6IgpXU4JgbiDjJtoXUul8gcyk6QovYu8VPvv
-QFkR/b1XIBN5N8ZjFZSkzS1Arr/Ll0OCp8geb4FYXANZIDrYt5nwXJRJcVWOEIP+
-WLSx+0G/75u2EvWR5DOplQtQjEh3vUUWjRFQWoVxmnq5G+Xj4a/wPfsZOu+l4ZQ7
-qnQSQwD+Jx7FxMJgVmMXqmk5feCVdH5usuN106hssDZgbfFGfcoIrVRvHx9HHp8u
-Rb41cbWXqpLU+WzpqbbOYxqGHQ==
+MIID9zCCAt+gAwIBAgIUF5TCqWJQnYbhKZ+b/Kr9HOpf2dIwDQYJKoZIhvcNAQEL
+BQAwgaMxCzAJBgNVBAYTAlVTMRAwDgYDVQQIDAdNb250YW5hMRAwDgYDVQQHDAdC
+b3plbWFuMRQwEgYDVQQLDAtFbmdpbmVlcmluZzE5MDcGA1UEAwwwREVSOjMwOjBk
+OjgyOjBiOjZjOjZmOjYzOjYxOjZjOjY4OjZmOjczOjc0OjAwOjY4MR8wHQYJKoZI
+hvcNAQkBFhBpbmZvQHdvbGZzc2wuY29tMB4XDTI0MTIxODIzMTEyM1oXDTI3MDkx
+NDIzMTEyM1owgaMxCzAJBgNVBAYTAlVTMRAwDgYDVQQIDAdNb250YW5hMRAwDgYD
+VQQHDAdCb3plbWFuMRQwEgYDVQQLDAtFbmdpbmVlcmluZzE5MDcGA1UEAwwwREVS
+OjMwOjBkOjgyOjBiOjZjOjZmOjYzOjYxOjZjOjY4OjZmOjczOjc0OjAwOjY4MR8w
+HQYJKoZIhvcNAQkBFhBpbmZvQHdvbGZzc2wuY29tMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAwJUI4VdB8nFtt9JFQScBZcZFrvK8JDC4lc4vTtb2HIi8
+fJ/7qGd//lycUXX3isoH5zUvj+G9e8AvfKtkqBf8yl17uuAh5XIuby6G2JVz2qwb
+U7lfP9cZDSVP4WNjUYsLZD+tQ7ilHFw0s64AoGPF9n8LWWh4c6aMGKkCba/DGQEu
+uBDjxsxAtGmjRjNph27Euxem8+jdrXO8ey8htf1mUQy9VLPhbV8cvCNz0QkDiRTS
+ELlkwyrQoZZKvOHUGlvHoMDBY3gPRDcwMpaAMiOVoXe6E9KXc+JdJclqDcM5YKS0
+sGlCQgnp2Ai8MyCzWCKnquvE4eZhg8XSlt/Z0E+t1wIDAQABoyEwHzAdBgNVHQ4E
+FgQUsxEyyZKYhOLJ+NA7bgNCyh8OjjwwDQYJKoZIhvcNAQELBQADggEBABdoXd7x
+DheleYnhdewyx5GSGYBXBcftDe66YnnQFg5ogmllyfOn0MyIiylizbW6rnufUI9e
+l5TOnLQgbAznjwq2/UI2o5/axu7UCivqYAZfHfLpM4dRRKIVwo8ygu//JOWP5yOY
+HFwixNcnEjOOrXdbNdSHbsOSG9+ms99mFuDWhUJ467QaDVaJpefU27AjSMhfo6fA
+zEZAlj2+u7kQA0YtZ8jn8Wsl865XPdzIBhvTjZc1wQe5DsEmoTBxkOh5hIrGNo82
+zKUKEpDdGaLM4tbFfVOypYb9uI+9X2xZSVrvi9as08yu12tq/PHfF0jAEUKhKV4/
+V+0twbkJtW7cPz8=
 -----END CERTIFICATE-----
diff --git a/certs/test/server-garbage.der b/certs/test/server-garbage.der
index f7855e702..03e447221 100644
Binary files a/certs/test/server-garbage.der and b/certs/test/server-garbage.der differ
diff --git a/certs/test/server-garbage.pem b/certs/test/server-garbage.pem
index a1066db85..6726b63e1 100644
--- a/certs/test/server-garbage.pem
+++ b/certs/test/server-garbage.pem
@@ -2,12 +2,12 @@ Certificate:
     Data:
         Version: 3 (0x2)
         Serial Number:
-            66:46:37:13:3e:b9:a5:e8:a5:d0:27:58:6b:f4:d6:1a:96:7f:93:d6
+            44:af:a7:b0:61:69:50:85:94:af:87:41:9b:43:ea:eb:6e:ce:bc:1c
         Signature Algorithm: sha256WithRSAEncryption
         Issuer: C = US, ST = Montana, L = Bozeman, OU = Engineering, CN = localhost, emailAddress = info@wolfssl.com
         Validity
-            Not Before: Dec 18 21:25:31 2024 GMT
-            Not After : Sep 14 21:25:31 2027 GMT
+            Not Before: Dec 18 23:11:23 2024 GMT
+            Not After : Sep 14 23:11:23 2027 GMT
         Subject: C = US, ST = Montana, L = Bozeman, OU = Engineering, CN = localhost, emailAddress = info@wolfssl.com
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
@@ -39,27 +39,27 @@ Certificate:
                 B3:11:32:C9:92:98:84:E2:C9:F8:D0:3B:6E:03:42:CA:1F:0E:8E:3C
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        10:68:f7:84:31:27:7b:2f:1f:0a:fa:c8:38:47:69:e0:dd:01:
-        11:d6:1b:be:4f:b3:89:43:25:5c:81:66:ff:85:9d:c4:5a:3c:
-        40:14:18:87:de:c0:c2:0f:47:2f:a6:e4:5d:c2:96:a4:24:cf:
-        c0:f0:8a:7c:9c:40:5f:81:9d:58:22:b3:81:e2:6c:cb:62:da:
-        20:7a:86:e1:82:11:c2:a9:4f:68:a1:69:67:e2:19:c1:d1:ad:
-        2c:f2:e0:d2:c4:c4:4a:05:74:68:6c:9b:bf:66:a5:d9:1f:98:
-        40:4d:43:6b:c7:a1:16:f6:37:53:b2:c6:73:6f:33:33:da:2e:
-        55:5d:e4:cf:4e:64:5e:58:c5:8a:a3:76:41:33:e0:e2:f0:ef:
-        62:29:3c:0e:9d:95:4b:93:0c:fa:65:9c:19:6c:9e:2a:03:7a:
-        d4:11:33:3c:ec:72:54:9e:2d:d3:af:88:9c:e0:58:b9:a7:a1:
-        4e:7a:0d:eb:65:49:cb:58:32:92:25:09:b9:bf:55:52:90:c8:
-        18:9a:0f:b9:97:46:a2:1b:1f:77:2d:38:50:cd:72:fe:90:f1:
-        93:59:ce:5f:56:8e:a6:f8:34:56:92:47:fe:58:d2:8d:4c:c7:
-        bb:b3:d3:8a:70:40:57:ae:b1:03:c4:92:30:e6:a0:5d:16:10:
-        41:95:94:ac
+        7f:66:0a:08:a6:40:ae:0b:3f:2e:ab:e7:fb:16:93:d4:88:15:
+        a1:fe:e5:ef:1e:64:95:66:60:d4:59:4a:e5:3a:f0:12:40:6c:
+        8f:9f:42:b2:61:09:76:a0:bc:9c:49:90:17:29:3b:db:87:20:
+        ab:61:f7:73:e4:ea:45:08:56:2f:f4:11:32:b8:5c:30:b5:4f:
+        39:e6:32:41:5a:4c:a9:27:5a:a5:fa:29:44:b0:f0:88:39:1a:
+        0d:bc:4c:44:05:c5:5b:80:b1:75:5f:88:af:6b:65:f7:cd:96:
+        1b:cb:25:f9:90:83:bf:58:74:4d:2e:d5:e0:d3:a0:78:bb:79:
+        46:6c:3f:23:1f:f7:78:48:56:30:1a:1f:61:d7:a0:a3:10:78:
+        9f:32:1a:d7:c8:e0:67:0b:bd:5d:e5:77:54:54:af:e4:40:64:
+        f9:3e:13:5a:6f:f0:e7:bf:e5:a4:ef:7f:b9:23:e3:b0:75:b9:
+        e8:fa:d5:12:e8:df:5f:1e:09:1c:0a:89:c4:f5:a5:d1:af:eb:
+        37:fe:cf:19:85:5b:ce:fd:ad:7b:2c:b3:4c:44:3f:3e:45:c9:
+        83:0e:16:9b:a3:6d:25:a9:88:3f:46:7e:dd:21:8d:4a:a5:96:
+        3d:3e:71:fb:f7:4a:ea:ee:ab:b2:5d:ad:3d:3b:62:c8:bb:66:
+        a6:ac:07:7f
 -----BEGIN CERTIFICATE-----
-MIIDuzCCAqOgAwIBAgIUZkY3Ez65peil0CdYa/TWGpZ/k9YwDQYJKoZIhvcNAQEL
+MIIDuzCCAqOgAwIBAgIURK+nsGFpUIWUr4dBm0Pq627OvBwwDQYJKoZIhvcNAQEL
 BQAwfDELMAkGA1UEBhMCVVMxEDAOBgNVBAgMB01vbnRhbmExEDAOBgNVBAcMB0Jv
 emVtYW4xFDASBgNVBAsMC0VuZ2luZWVyaW5nMRIwEAYDVQQDDAlsb2NhbGhvc3Qx
-HzAdBgkqhkiG9w0BCQEWEGluZm9Ad29sZnNzbC5jb20wHhcNMjQxMjE4MjEyNTMx
-WhcNMjcwOTE0MjEyNTMxWjB8MQswCQYDVQQGEwJVUzEQMA4GA1UECAwHTW9udGFu
+HzAdBgkqhkiG9w0BCQEWEGluZm9Ad29sZnNzbC5jb20wHhcNMjQxMjE4MjMxMTIz
+WhcNMjcwOTE0MjMxMTIzWjB8MQswCQYDVQQGEwJVUzEQMA4GA1UECAwHTW9udGFu
 YTEQMA4GA1UEBwwHQm96ZW1hbjEUMBIGA1UECwwLRW5naW5lZXJpbmcxEjAQBgNV
 BAMMCWxvY2FsaG9zdDEfMB0GCSqGSIb3DQEJARYQaW5mb0B3b2xmc3NsLmNvbTCC
 ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMCVCOFXQfJxbbfSRUEnAWXG
@@ -69,10 +69,10 @@ C1loeHOmjBipAm2vwxkBLrgQ48bMQLRpo0YzaYduxLsXpvPo3a1zvHsvIbX9ZlEM
 vVSz4W1fHLwjc9EJA4kU0hC5ZMMq0KGWSrzh1Bpbx6DAwWN4D0Q3MDKWgDIjlaF3
 uhPSl3PiXSXJag3DOWCktLBpQkIJ6dgIvDMgs1gip6rrxOHmYYPF0pbf2dBPrdcC
 AwEAAaM1MDMwEgYDVR0RBAswCYIHZ2FyYmFnZTAdBgNVHQ4EFgQUsxEyyZKYhOLJ
-+NA7bgNCyh8OjjwwDQYJKoZIhvcNAQELBQADggEBABBo94QxJ3svHwr6yDhHaeDd
-ARHWG75Ps4lDJVyBZv+FncRaPEAUGIfewMIPRy+m5F3ClqQkz8DwinycQF+BnVgi
-s4HibMti2iB6huGCEcKpT2ihaWfiGcHRrSzy4NLExEoFdGhsm79mpdkfmEBNQ2vH
-oRb2N1OyxnNvMzPaLlVd5M9OZF5YxYqjdkEz4OLw72IpPA6dlUuTDPplnBlsnioD
-etQRMzzsclSeLdOviJzgWLmnoU56DetlSctYMpIlCbm/VVKQyBiaD7mXRqIbH3ct
-OFDNcv6Q8ZNZzl9Wjqb4NFaSR/5Y0o1Mx7uz04pwQFeusQPEkjDmoF0WEEGVlKw=
++NA7bgNCyh8OjjwwDQYJKoZIhvcNAQELBQADggEBAH9mCgimQK4LPy6r5/sWk9SI
+FaH+5e8eZJVmYNRZSuU68BJAbI+fQrJhCXagvJxJkBcpO9uHIKth93Pk6kUIVi/0
+ETK4XDC1TznmMkFaTKknWqX6KUSw8Ig5Gg28TEQFxVuAsXVfiK9rZffNlhvLJfmQ
+g79YdE0u1eDToHi7eUZsPyMf93hIVjAaH2HXoKMQeJ8yGtfI4GcLvV3ld1RUr+RA
+ZPk+E1pv8Oe/5aTvf7kj47B1uej61RLo318eCRwKicT1pdGv6zf+zxmFW879rXss
+s0xEPz5FyYMOFpujbSWpiD9Gft0hjUqllj0+cfv3Suruq7JdrT07Ysi7ZqasB38=
 -----END CERTIFICATE-----
diff --git a/certs/test/server-goodalt.der b/certs/test/server-goodalt.der
index 33a74c781..97523dca1 100644
Binary files a/certs/test/server-goodalt.der and b/certs/test/server-goodalt.der differ
diff --git a/certs/test/server-goodalt.pem b/certs/test/server-goodalt.pem
index d1a053f7f..0301b2c72 100644
--- a/certs/test/server-goodalt.pem
+++ b/certs/test/server-goodalt.pem
@@ -2,12 +2,12 @@ Certificate:
     Data:
         Version: 3 (0x2)
         Serial Number:
-            26:94:27:18:12:1d:80:0a:63:2a:be:1a:73:ac:ec:01:c0:70:18:fc
+            29:58:d0:14:fc:30:87:e9:92:88:93:69:43:1d:3d:3e:d1:c4:4f:09
         Signature Algorithm: sha256WithRSAEncryption
         Issuer: C = US, ST = Montana, L = Bozeman, OU = Engineering, CN = www.nomatch.com, emailAddress = info@wolfssl.com
         Validity
-            Not Before: Dec 18 21:25:31 2024 GMT
-            Not After : Sep 14 21:25:31 2027 GMT
+            Not Before: Dec 18 23:11:23 2024 GMT
+            Not After : Sep 14 23:11:23 2027 GMT
         Subject: C = US, ST = Montana, L = Bozeman, OU = Engineering, CN = www.nomatch.com, emailAddress = info@wolfssl.com
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
@@ -39,27 +39,27 @@ Certificate:
                 B3:11:32:C9:92:98:84:E2:C9:F8:D0:3B:6E:03:42:CA:1F:0E:8E:3C
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        34:f8:7f:75:98:f3:6f:2b:bb:41:52:0d:20:52:5a:10:30:ae:
-        08:37:0e:5c:0f:8d:c0:82:c2:94:23:5b:4e:f7:1e:91:c9:fe:
-        93:a3:2d:9c:89:e0:cc:ec:dd:10:6b:6b:87:1f:5c:bc:b2:b7:
-        9a:5c:f2:74:fa:a1:14:4c:59:6b:ed:cc:af:db:d5:88:35:27:
-        26:85:b1:ed:44:dd:70:63:77:f6:55:f5:a0:78:ed:d8:ee:98:
-        16:c9:d8:4c:97:0d:7b:e2:d3:0c:38:4d:98:69:0c:da:b5:5e:
-        f0:98:ee:85:f5:95:68:df:00:ca:16:b0:bf:99:6b:f8:03:f7:
-        ce:83:bb:1a:19:30:10:6c:23:4d:97:bb:09:a8:86:bb:c9:3f:
-        12:fd:77:64:58:a4:6f:42:db:2c:0c:60:91:78:fd:f4:01:6f:
-        46:3e:52:3c:f0:93:b2:68:33:86:1f:f7:d2:24:fc:81:6f:66:
-        3b:73:b4:00:5a:23:8a:c6:91:de:54:f9:bd:48:17:63:c4:d2:
-        ee:bb:4b:15:9a:01:db:4a:66:30:0b:28:38:3c:84:52:9e:94:
-        15:85:d5:eb:45:df:07:19:c7:cc:23:8d:51:aa:c4:73:8b:86:
-        55:5e:ab:9c:d5:79:0d:d3:b8:68:94:d7:df:85:db:eb:f4:37:
-        48:b3:4f:e7
+        3a:11:87:c4:39:d0:6b:90:68:03:07:14:9a:dd:4c:ec:2d:01:
+        d6:95:86:f9:75:43:66:9c:49:db:b9:a9:c0:79:fd:da:0d:d7:
+        fd:1e:a9:04:88:d8:b3:c3:45:c5:2b:1a:9f:e2:89:af:77:44:
+        ae:6e:e8:b4:1d:70:f6:16:f6:cf:fa:47:f5:b8:38:d2:60:b3:
+        e6:7f:62:27:cf:0b:ff:16:f2:27:7b:1d:d1:56:e3:f2:1f:21:
+        35:58:49:3a:a8:3b:d8:e6:db:39:e2:52:d5:39:1e:f2:31:23:
+        da:fe:34:af:98:fe:d5:2e:d6:a6:0a:4d:cc:48:60:bd:a0:1e:
+        c9:13:08:f6:0f:f5:fc:9d:00:09:e0:64:a8:af:1b:8f:0c:3f:
+        b5:17:be:68:47:65:81:8e:68:a6:ac:f8:ea:fa:bd:01:e2:f7:
+        54:d3:00:7e:a1:3b:ee:cb:d4:3f:42:8f:ef:85:a8:46:92:15:
+        da:0d:02:54:fa:c4:86:ef:80:be:29:d1:d5:a2:43:f8:79:a9:
+        53:f2:01:74:f6:31:80:85:61:a1:2c:98:da:7b:d5:3f:42:53:
+        55:d5:fd:c7:be:8f:57:78:db:dc:8b:e6:78:92:40:e9:33:53:
+        bc:3d:e7:4f:64:ec:32:c0:bf:12:d6:34:e3:94:1f:a7:6b:b2:
+        52:5b:56:27
 -----BEGIN CERTIFICATE-----
-MIIDyzCCArOgAwIBAgIUJpQnGBIdgApjKr4ac6zsAcBwGPwwDQYJKoZIhvcNAQEL
+MIIDyzCCArOgAwIBAgIUKVjQFPwwh+mSiJNpQx09PtHETwkwDQYJKoZIhvcNAQEL
 BQAwgYIxCzAJBgNVBAYTAlVTMRAwDgYDVQQIDAdNb250YW5hMRAwDgYDVQQHDAdC
 b3plbWFuMRQwEgYDVQQLDAtFbmdpbmVlcmluZzEYMBYGA1UEAwwPd3d3Lm5vbWF0
 Y2guY29tMR8wHQYJKoZIhvcNAQkBFhBpbmZvQHdvbGZzc2wuY29tMB4XDTI0MTIx
-ODIxMjUzMVoXDTI3MDkxNDIxMjUzMVowgYIxCzAJBgNVBAYTAlVTMRAwDgYDVQQI
+ODIzMTEyM1oXDTI3MDkxNDIzMTEyM1owgYIxCzAJBgNVBAYTAlVTMRAwDgYDVQQI
 DAdNb250YW5hMRAwDgYDVQQHDAdCb3plbWFuMRQwEgYDVQQLDAtFbmdpbmVlcmlu
 ZzEYMBYGA1UEAwwPd3d3Lm5vbWF0Y2guY29tMR8wHQYJKoZIhvcNAQkBFhBpbmZv
 QHdvbGZzc2wuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwJUI
@@ -69,11 +69,11 @@ Q7ilHFw0s64AoGPF9n8LWWh4c6aMGKkCba/DGQEuuBDjxsxAtGmjRjNph27Euxem
 8+jdrXO8ey8htf1mUQy9VLPhbV8cvCNz0QkDiRTSELlkwyrQoZZKvOHUGlvHoMDB
 Y3gPRDcwMpaAMiOVoXe6E9KXc+JdJclqDcM5YKS0sGlCQgnp2Ai8MyCzWCKnquvE
 4eZhg8XSlt/Z0E+t1wIDAQABozcwNTAUBgNVHREEDTALgglsb2NhbGhvc3QwHQYD
-VR0OBBYEFLMRMsmSmITiyfjQO24DQsofDo48MA0GCSqGSIb3DQEBCwUAA4IBAQA0
-+H91mPNvK7tBUg0gUloQMK4INw5cD43AgsKUI1tO9x6Ryf6Toy2cieDM7N0Qa2uH
-H1y8sreaXPJ0+qEUTFlr7cyv29WINScmhbHtRN1wY3f2VfWgeO3Y7pgWydhMlw17
-4tMMOE2YaQzatV7wmO6F9ZVo3wDKFrC/mWv4A/fOg7saGTAQbCNNl7sJqIa7yT8S
-/XdkWKRvQtssDGCReP30AW9GPlI88JOyaDOGH/fSJPyBb2Y7c7QAWiOKxpHeVPm9
-SBdjxNLuu0sVmgHbSmYwCyg4PIRSnpQVhdXrRd8HGcfMI41RqsRzi4ZVXquc1XkN
-07holNffhdvr9DdIs0/n
+VR0OBBYEFLMRMsmSmITiyfjQO24DQsofDo48MA0GCSqGSIb3DQEBCwUAA4IBAQA6
+EYfEOdBrkGgDBxSa3UzsLQHWlYb5dUNmnEnbuanAef3aDdf9HqkEiNizw0XFKxqf
+4omvd0Subui0HXD2FvbP+kf1uDjSYLPmf2Inzwv/FvInex3RVuPyHyE1WEk6qDvY
+5ts54lLVOR7yMSPa/jSvmP7VLtamCk3MSGC9oB7JEwj2D/X8nQAJ4GSorxuPDD+1
+F75oR2WBjmimrPjq+r0B4vdU0wB+oTvuy9Q/Qo/vhahGkhXaDQJU+sSG74C+KdHV
+okP4ealT8gF09jGAhWGhLJjae9U/QlNV1f3Hvo9XeNvci+Z4kkDpM1O8PedPZOwy
+wL8S1jTjlB+na7JSW1Yn
 -----END CERTIFICATE-----
diff --git a/certs/test/server-goodaltwild.der b/certs/test/server-goodaltwild.der
index a1504349f..bf69fe555 100644
Binary files a/certs/test/server-goodaltwild.der and b/certs/test/server-goodaltwild.der differ
diff --git a/certs/test/server-goodaltwild.pem b/certs/test/server-goodaltwild.pem
index cdef794de..0bcd15c82 100644
--- a/certs/test/server-goodaltwild.pem
+++ b/certs/test/server-goodaltwild.pem
@@ -2,12 +2,12 @@ Certificate:
     Data:
         Version: 3 (0x2)
         Serial Number:
-            5c:20:50:22:e3:71:31:60:7b:88:0f:95:97:3b:b4:ab:74:bb:39:2d
+            55:6f:ba:c1:27:17:d6:05:e5:7e:2b:64:44:77:37:6c:43:27:53:1c
         Signature Algorithm: sha256WithRSAEncryption
         Issuer: C = US, ST = Montana, L = Bozeman, OU = Engineering, CN = www.nomatch.com, emailAddress = info@wolfssl.com
         Validity
-            Not Before: Dec 18 21:25:31 2024 GMT
-            Not After : Sep 14 21:25:31 2027 GMT
+            Not Before: Dec 18 23:11:23 2024 GMT
+            Not After : Sep 14 23:11:23 2027 GMT
         Subject: C = US, ST = Montana, L = Bozeman, OU = Engineering, CN = www.nomatch.com, emailAddress = info@wolfssl.com
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
@@ -39,27 +39,27 @@ Certificate:
                 B3:11:32:C9:92:98:84:E2:C9:F8:D0:3B:6E:03:42:CA:1F:0E:8E:3C
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        bb:6b:d2:c8:df:dd:5e:32:74:9c:8c:99:6c:00:f1:6d:57:b5:
-        be:94:84:49:83:2d:65:d2:03:02:fc:15:8d:2a:3a:da:fd:f0:
-        d1:8e:0c:98:e8:03:b3:fe:13:93:11:15:36:1e:91:17:56:ac:
-        32:c3:ed:f7:a6:46:2e:69:d6:c5:61:70:aa:9a:49:c4:80:7b:
-        0f:da:53:9a:37:70:7c:a8:3d:a5:67:a9:f1:49:f2:78:15:2e:
-        60:cb:dc:fc:36:40:26:fa:67:0d:58:97:51:4c:34:35:f1:fb:
-        61:09:5d:dc:06:f7:fa:36:e0:76:4d:d1:fc:b7:38:70:94:47:
-        49:03:3c:81:0e:16:58:04:34:1e:28:ea:96:db:80:a1:ee:f8:
-        96:05:78:6d:6b:61:ae:f2:ab:a7:ab:da:71:13:c7:9e:fb:17:
-        86:31:58:a2:b4:c6:91:41:d9:0a:00:3a:0d:f7:e7:f0:28:11:
-        99:c9:ad:f6:d4:db:2e:7f:72:3f:41:bb:df:bf:f6:d5:33:c5:
-        10:27:36:8c:b5:cd:98:da:f6:b3:94:31:91:62:19:2d:8f:3d:
-        da:53:5f:29:c5:a5:86:34:7f:03:ba:97:c9:79:83:3e:e3:3e:
-        b9:19:8f:2d:29:3c:58:50:d3:a2:45:bd:e3:5b:27:27:c8:ea:
-        4b:fc:c5:41
+        40:87:46:bf:1e:07:d3:d6:b2:aa:e1:57:60:18:63:cd:98:d0:
+        12:81:55:c7:87:62:d4:f8:6d:49:a4:b2:8d:25:5a:7b:10:47:
+        1a:21:72:59:fe:47:b8:7e:e2:24:e8:a4:42:e0:30:06:f3:9d:
+        aa:47:c5:a2:48:71:30:3b:f8:99:f7:fc:bb:5d:44:59:81:da:
+        b9:bb:3c:d3:9c:e5:d7:2d:59:35:2a:0a:48:5f:12:a7:ec:bc:
+        0f:34:43:7b:76:eb:1e:c8:25:0a:84:74:da:4a:dc:8b:52:34:
+        56:ab:2f:c1:f3:bd:3e:71:94:a5:3c:61:79:1f:5b:28:cd:66:
+        3b:d4:e9:82:eb:e5:55:65:eb:44:2b:54:35:d9:1d:6c:d5:c4:
+        1d:bf:a7:e0:6f:4b:b9:14:d5:b1:80:82:d6:9e:da:49:e8:7f:
+        d1:08:8f:ea:ec:e1:ba:cb:4f:1d:e0:4e:31:39:34:0d:98:62:
+        c4:a8:93:28:4a:76:9e:70:c9:43:cd:93:21:ae:38:9e:81:1a:
+        aa:0d:91:cc:3a:39:7e:ce:12:6b:7c:4d:6c:26:9a:1a:cb:68:
+        af:e4:06:be:8d:36:cc:37:19:0a:67:77:1c:13:c0:42:d6:24:
+        52:e3:8e:2c:94:01:f2:54:11:21:8c:1a:08:18:a8:07:8c:73:
+        26:53:05:09
 -----BEGIN CERTIFICATE-----
-MIIDzDCCArSgAwIBAgIUXCBQIuNxMWB7iA+Vlzu0q3S7OS0wDQYJKoZIhvcNAQEL
+MIIDzDCCArSgAwIBAgIUVW+6wScX1gXlfitkRHc3bEMnUxwwDQYJKoZIhvcNAQEL
 BQAwgYIxCzAJBgNVBAYTAlVTMRAwDgYDVQQIDAdNb250YW5hMRAwDgYDVQQHDAdC
 b3plbWFuMRQwEgYDVQQLDAtFbmdpbmVlcmluZzEYMBYGA1UEAwwPd3d3Lm5vbWF0
 Y2guY29tMR8wHQYJKoZIhvcNAQkBFhBpbmZvQHdvbGZzc2wuY29tMB4XDTI0MTIx
-ODIxMjUzMVoXDTI3MDkxNDIxMjUzMVowgYIxCzAJBgNVBAYTAlVTMRAwDgYDVQQI
+ODIzMTEyM1oXDTI3MDkxNDIzMTEyM1owgYIxCzAJBgNVBAYTAlVTMRAwDgYDVQQI
 DAdNb250YW5hMRAwDgYDVQQHDAdCb3plbWFuMRQwEgYDVQQLDAtFbmdpbmVlcmlu
 ZzEYMBYGA1UEAwwPd3d3Lm5vbWF0Y2guY29tMR8wHQYJKoZIhvcNAQkBFhBpbmZv
 QHdvbGZzc2wuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwJUI
@@ -70,10 +70,10 @@ Q7ilHFw0s64AoGPF9n8LWWh4c6aMGKkCba/DGQEuuBDjxsxAtGmjRjNph27Euxem
 Y3gPRDcwMpaAMiOVoXe6E9KXc+JdJclqDcM5YKS0sGlCQgnp2Ai8MyCzWCKnquvE
 4eZhg8XSlt/Z0E+t1wIDAQABozgwNjAVBgNVHREEDjAMggoqbG9jYWxob3N0MB0G
 A1UdDgQWBBSzETLJkpiE4sn40DtuA0LKHw6OPDANBgkqhkiG9w0BAQsFAAOCAQEA
-u2vSyN/dXjJ0nIyZbADxbVe1vpSESYMtZdIDAvwVjSo62v3w0Y4MmOgDs/4TkxEV
-Nh6RF1asMsPt96ZGLmnWxWFwqppJxIB7D9pTmjdwfKg9pWep8UnyeBUuYMvc/DZA
-JvpnDViXUUw0NfH7YQld3Ab3+jbgdk3R/Lc4cJRHSQM8gQ4WWAQ0HijqltuAoe74
-lgV4bWthrvKrp6vacRPHnvsXhjFYorTGkUHZCgA6Dffn8CgRmcmt9tTbLn9yP0G7
-37/21TPFECc2jLXNmNr2s5QxkWIZLY892lNfKcWlhjR/A7qXyXmDPuM+uRmPLSk8
-WFDTokW941snJ8jqS/zFQQ==
+QIdGvx4H09ayquFXYBhjzZjQEoFVx4di1PhtSaSyjSVaexBHGiFyWf5HuH7iJOik
+QuAwBvOdqkfFokhxMDv4mff8u11EWYHaubs805zl1y1ZNSoKSF8Sp+y8DzRDe3br
+HsglCoR02krci1I0VqsvwfO9PnGUpTxheR9bKM1mO9TpguvlVWXrRCtUNdkdbNXE
+Hb+n4G9LuRTVsYCC1p7aSeh/0QiP6uzhustPHeBOMTk0DZhixKiTKEp2nnDJQ82T
+Ia44noEaqg2RzDo5fs4Sa3xNbCaaGstor+QGvo02zDcZCmd3HBPAQtYkUuOOLJQB
+8lQRIYwaCBioB4xzJlMFCQ==
 -----END CERTIFICATE-----
diff --git a/certs/test/server-goodcn.der b/certs/test/server-goodcn.der
index a536ff5b3..4986c8bf6 100644
Binary files a/certs/test/server-goodcn.der and b/certs/test/server-goodcn.der differ
diff --git a/certs/test/server-goodcn.pem b/certs/test/server-goodcn.pem
index e8e2f751a..a28127443 100644
--- a/certs/test/server-goodcn.pem
+++ b/certs/test/server-goodcn.pem
@@ -1,13 +1,13 @@
 Certificate:
     Data:
-        Version: 1 (0x0)
+        Version: 3 (0x2)
         Serial Number:
-            18:de:e0:3b:89:87:8e:4f:24:bf:64:80:ea:74:1d:ce:f7:43:5a:b4
+            20:e4:76:1c:be:16:94:8a:8c:e8:34:37:a5:1b:37:c9:f9:42:c9:30
         Signature Algorithm: sha256WithRSAEncryption
         Issuer: C = US, ST = Montana, L = Bozeman, OU = Engineering, CN = localhost, emailAddress = info@wolfssl.com
         Validity
-            Not Before: Dec 18 21:25:31 2024 GMT
-            Not After : Sep 14 21:25:31 2027 GMT
+            Not Before: Dec 18 23:11:23 2024 GMT
+            Not After : Sep 14 23:11:23 2027 GMT
         Subject: C = US, ST = Montana, L = Bozeman, OU = Engineering, CN = localhost, emailAddress = info@wolfssl.com
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
@@ -32,41 +32,45 @@ Certificate:
                     a7:aa:eb:c4:e1:e6:61:83:c5:d2:96:df:d9:d0:4f:
                     ad:d7
                 Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Subject Key Identifier: 
+                B3:11:32:C9:92:98:84:E2:C9:F8:D0:3B:6E:03:42:CA:1F:0E:8E:3C
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        54:fe:15:59:26:f8:58:cb:47:50:c6:9d:27:7a:f2:38:bb:c4:
-        79:00:1b:aa:2c:dc:3d:c8:d2:95:39:35:fc:8e:c1:1d:33:1d:
-        a6:73:8a:2e:a9:59:23:fd:75:5c:a5:dd:2c:e6:3e:05:ce:c1:
-        0e:a8:35:27:fb:25:61:54:2a:00:f4:7e:d8:d2:f8:4b:fe:94:
-        2f:9d:e8:8f:a5:18:f8:12:b7:c0:e9:da:c3:27:dc:bd:03:cf:
-        9b:44:ff:a4:53:13:ce:2b:9e:d4:0a:c7:fd:c7:33:1a:f3:26:
-        a4:15:25:ef:0e:65:c0:56:48:ee:0b:41:e5:42:82:b6:1f:d6:
-        2f:be:47:34:1b:d1:76:d3:05:cd:88:fe:fc:3a:e0:50:12:94:
-        62:0e:fd:ae:96:30:c8:d2:ac:3a:87:8c:f0:32:70:54:0b:d7:
-        2c:37:d1:ba:4d:cb:3e:c4:57:55:ce:d0:18:56:32:d5:1c:f7:
-        b7:f7:06:23:41:3f:f2:04:30:23:80:39:7b:ab:74:b3:a7:1c:
-        b1:da:57:9c:44:60:e6:82:01:60:75:4a:5d:20:16:b7:bb:ff:
-        d9:6b:61:d2:87:ce:f5:38:45:67:82:60:30:bf:1e:11:4d:d3:
-        5d:14:d9:28:2e:b9:ab:5e:35:0b:cb:98:9b:fe:1e:d5:1c:2b:
-        02:fb:c4:c2
+        66:a2:01:32:ef:f2:60:53:90:50:4e:11:cf:80:0c:66:32:fc:
+        f2:16:d1:26:15:57:fe:43:2f:ee:f4:ab:05:cd:db:b7:b7:f7:
+        9d:b4:11:b3:4a:b5:4f:bf:01:ba:3d:89:05:7c:2e:42:66:fd:
+        a9:c9:e8:9d:9a:85:95:7e:1f:35:41:eb:45:d3:ea:de:a3:1c:
+        eb:36:ad:3e:c9:a0:1c:31:c3:e3:f5:4c:bc:a7:7e:04:52:70:
+        e7:89:dd:a3:fc:32:a2:7b:26:b9:ea:2b:9e:06:9d:a7:6d:1f:
+        1d:52:e9:11:3f:a1:1d:87:1e:82:17:eb:05:78:e5:70:f3:23:
+        3f:15:73:12:31:cd:11:b3:b1:fa:2b:7c:6b:5d:2d:04:6c:5f:
+        28:9c:39:ba:50:0e:8a:ec:4b:2b:11:fb:09:e8:c6:05:5c:b4:
+        45:7a:e5:52:78:fe:c0:c3:57:c1:df:ce:a8:9b:86:d5:c6:6a:
+        61:c6:36:7a:50:3d:7e:b9:3e:e6:6e:40:6e:d9:08:65:ef:88:
+        11:bc:37:f2:cb:5f:04:ec:9e:c8:4c:48:2f:26:6c:1c:e4:e0:
+        b6:a8:63:b7:42:4c:81:2e:f0:3d:d8:a0:e1:6c:16:3e:40:4b:
+        ec:1b:43:9d:99:c8:36:99:cd:d7:1c:6d:c7:98:88:ce:05:b6:
+        93:de:19:d1
 -----BEGIN CERTIFICATE-----
-MIIDfzCCAmcCFBje4DuJh45PJL9kgOp0Hc73Q1q0MA0GCSqGSIb3DQEBCwUAMHwx
-CzAJBgNVBAYTAlVTMRAwDgYDVQQIDAdNb250YW5hMRAwDgYDVQQHDAdCb3plbWFu
-MRQwEgYDVQQLDAtFbmdpbmVlcmluZzESMBAGA1UEAwwJbG9jYWxob3N0MR8wHQYJ
-KoZIhvcNAQkBFhBpbmZvQHdvbGZzc2wuY29tMB4XDTI0MTIxODIxMjUzMVoXDTI3
-MDkxNDIxMjUzMVowfDELMAkGA1UEBhMCVVMxEDAOBgNVBAgMB01vbnRhbmExEDAO
-BgNVBAcMB0JvemVtYW4xFDASBgNVBAsMC0VuZ2luZWVyaW5nMRIwEAYDVQQDDAls
-b2NhbGhvc3QxHzAdBgkqhkiG9w0BCQEWEGluZm9Ad29sZnNzbC5jb20wggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDAlQjhV0HycW230kVBJwFlxkWu8rwk
-MLiVzi9O1vYciLx8n/uoZ3/+XJxRdfeKygfnNS+P4b17wC98q2SoF/zKXXu64CHl
-ci5vLobYlXParBtTuV8/1xkNJU/hY2NRiwtkP61DuKUcXDSzrgCgY8X2fwtZaHhz
-powYqQJtr8MZAS64EOPGzEC0aaNGM2mHbsS7F6bz6N2tc7x7LyG1/WZRDL1Us+Ft
-Xxy8I3PRCQOJFNIQuWTDKtChlkq84dQaW8egwMFjeA9ENzAyloAyI5Whd7oT0pdz
-4l0lyWoNwzlgpLSwaUJCCenYCLwzILNYIqeq68Th5mGDxdKW39nQT63XAgMBAAEw
-DQYJKoZIhvcNAQELBQADggEBAFT+FVkm+FjLR1DGnSd68ji7xHkAG6os3D3I0pU5
-NfyOwR0zHaZzii6pWSP9dVyl3SzmPgXOwQ6oNSf7JWFUKgD0ftjS+Ev+lC+d6I+l
-GPgSt8Dp2sMn3L0Dz5tE/6RTE84rntQKx/3HMxrzJqQVJe8OZcBWSO4LQeVCgrYf
-1i++RzQb0XbTBc2I/vw64FASlGIO/a6WMMjSrDqHjPAycFQL1yw30bpNyz7EV1XO
-0BhWMtUc97f3BiNBP/IEMCOAOXurdLOnHLHaV5xEYOaCAWB1Sl0gFre7/9lrYdKH
-zvU4RWeCYDC/HhFN010U2SguuateNQvLmJv+HtUcKwL7xMI=
+MIIDpzCCAo+gAwIBAgIUIOR2HL4WlIqM6DQ3pRs3yflCyTAwDQYJKoZIhvcNAQEL
+BQAwfDELMAkGA1UEBhMCVVMxEDAOBgNVBAgMB01vbnRhbmExEDAOBgNVBAcMB0Jv
+emVtYW4xFDASBgNVBAsMC0VuZ2luZWVyaW5nMRIwEAYDVQQDDAlsb2NhbGhvc3Qx
+HzAdBgkqhkiG9w0BCQEWEGluZm9Ad29sZnNzbC5jb20wHhcNMjQxMjE4MjMxMTIz
+WhcNMjcwOTE0MjMxMTIzWjB8MQswCQYDVQQGEwJVUzEQMA4GA1UECAwHTW9udGFu
+YTEQMA4GA1UEBwwHQm96ZW1hbjEUMBIGA1UECwwLRW5naW5lZXJpbmcxEjAQBgNV
+BAMMCWxvY2FsaG9zdDEfMB0GCSqGSIb3DQEJARYQaW5mb0B3b2xmc3NsLmNvbTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMCVCOFXQfJxbbfSRUEnAWXG
+Ra7yvCQwuJXOL07W9hyIvHyf+6hnf/5cnFF194rKB+c1L4/hvXvAL3yrZKgX/Mpd
+e7rgIeVyLm8uhtiVc9qsG1O5Xz/XGQ0lT+FjY1GLC2Q/rUO4pRxcNLOuAKBjxfZ/
+C1loeHOmjBipAm2vwxkBLrgQ48bMQLRpo0YzaYduxLsXpvPo3a1zvHsvIbX9ZlEM
+vVSz4W1fHLwjc9EJA4kU0hC5ZMMq0KGWSrzh1Bpbx6DAwWN4D0Q3MDKWgDIjlaF3
+uhPSl3PiXSXJag3DOWCktLBpQkIJ6dgIvDMgs1gip6rrxOHmYYPF0pbf2dBPrdcC
+AwEAAaMhMB8wHQYDVR0OBBYEFLMRMsmSmITiyfjQO24DQsofDo48MA0GCSqGSIb3
+DQEBCwUAA4IBAQBmogEy7/JgU5BQThHPgAxmMvzyFtEmFVf+Qy/u9KsFzdu3t/ed
+tBGzSrVPvwG6PYkFfC5CZv2pyeidmoWVfh81QetF0+reoxzrNq0+yaAcMcPj9Uy8
+p34EUnDnid2j/DKieya56iueBp2nbR8dUukRP6Edhx6CF+sFeOVw8yM/FXMSMc0R
+s7H6K3xrXS0EbF8onDm6UA6K7EsrEfsJ6MYFXLRFeuVSeP7Aw1fB386om4bVxmph
+xjZ6UD1+uT7mbkBu2Qhl74gRvDfyy18E7J7ITEgvJmwc5OC2qGO3QkyBLvA92KDh
+bBY+QEvsG0Odmcg2mc3XHG3HmIjOBbaT3hnR
 -----END CERTIFICATE-----
diff --git a/certs/test/server-goodcnwild.der b/certs/test/server-goodcnwild.der
index d3ee733c2..64122b2cc 100644
Binary files a/certs/test/server-goodcnwild.der and b/certs/test/server-goodcnwild.der differ
diff --git a/certs/test/server-goodcnwild.pem b/certs/test/server-goodcnwild.pem
index e95810dc5..35b68c1e9 100644
--- a/certs/test/server-goodcnwild.pem
+++ b/certs/test/server-goodcnwild.pem
@@ -1,13 +1,13 @@
 Certificate:
     Data:
-        Version: 1 (0x0)
+        Version: 3 (0x2)
         Serial Number:
-            5d:33:cc:8c:df:3c:dd:3f:1f:fe:83:f6:6b:e5:05:61:81:91:c0:88
+            57:58:1d:6f:ff:69:c2:43:43:a6:f2:d9:11:c3:8f:71:7f:f6:c3:ee
         Signature Algorithm: sha256WithRSAEncryption
         Issuer: C = US, ST = Montana, L = Bozeman, OU = Engineering, CN = *localhost, emailAddress = info@wolfssl.com
         Validity
-            Not Before: Dec 18 21:25:31 2024 GMT
-            Not After : Sep 14 21:25:31 2027 GMT
+            Not Before: Dec 18 23:11:23 2024 GMT
+            Not After : Sep 14 23:11:23 2027 GMT
         Subject: C = US, ST = Montana, L = Bozeman, OU = Engineering, CN = *localhost, emailAddress = info@wolfssl.com
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
@@ -32,41 +32,45 @@ Certificate:
                     a7:aa:eb:c4:e1:e6:61:83:c5:d2:96:df:d9:d0:4f:
                     ad:d7
                 Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Subject Key Identifier: 
+                B3:11:32:C9:92:98:84:E2:C9:F8:D0:3B:6E:03:42:CA:1F:0E:8E:3C
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        7c:ed:99:09:fb:a7:0c:67:f4:31:a2:0c:0f:b9:52:86:fa:b6:
-        e3:f5:cf:d6:6f:67:1d:b0:8a:dc:1e:3f:7d:6d:40:f3:bf:e7:
-        aa:57:8a:7a:92:e8:03:39:6c:e5:e7:f3:85:44:53:88:71:ed:
-        2a:61:c9:df:63:d0:58:13:93:08:c6:46:5c:5e:c5:77:34:b5:
-        11:f7:1d:97:d1:a6:76:f4:66:3c:21:9b:0b:94:f3:6b:92:a5:
-        d1:47:df:b2:47:1c:72:3d:0c:98:fe:43:5d:3f:cd:43:e9:9f:
-        f2:28:41:32:95:c8:4e:58:ac:bb:c7:22:d4:64:91:16:79:41:
-        3d:7a:53:c3:cb:ec:6f:3e:90:7c:88:f1:c4:da:c5:66:53:7e:
-        9a:cb:bd:ad:42:62:19:92:bb:ac:a4:7d:7a:fd:42:2c:23:2b:
-        73:0e:27:2b:d1:aa:86:62:fa:6e:60:80:c2:c3:3b:b3:f3:ba:
-        9e:04:db:28:a4:aa:b9:59:4c:e0:4f:b4:00:9e:d5:2d:fc:c6:
-        da:24:ad:36:cb:74:ba:e3:62:11:32:d2:1e:b0:36:af:bb:fc:
-        6b:f8:dd:a5:f1:e5:14:b0:d2:c4:4d:2a:3b:00:95:d4:63:79:
-        5d:62:f1:98:fb:6b:88:fc:bf:70:b3:9f:97:b5:5c:45:22:6a:
-        79:40:3b:e7
+        b6:7f:c6:0e:d0:6c:f9:0e:df:5d:71:ca:0c:fe:23:6b:14:f2:
+        0e:c1:c2:60:17:cb:c9:f4:0e:39:52:b9:8d:71:71:b1:d9:2d:
+        cb:0c:af:17:64:27:63:10:4f:25:96:bc:4e:ec:67:4a:bf:01:
+        8a:d7:bd:60:49:f4:41:74:c2:48:3e:ef:4a:2c:e9:c0:bb:5f:
+        2b:38:2e:24:b7:40:f0:be:5c:57:23:bf:46:12:a8:47:78:0d:
+        2f:76:fc:9d:3b:e3:93:40:25:18:2b:64:df:13:f1:db:26:72:
+        3d:8c:c4:b8:e9:dc:60:fc:3a:48:de:58:80:c9:8a:0d:a8:14:
+        b2:81:5e:00:b5:a6:0e:a2:c8:06:4e:d5:0a:3b:37:6b:64:d8:
+        77:2b:09:0a:44:f4:bd:c8:51:78:29:6d:e1:5d:ae:a3:04:44:
+        45:dc:d5:ea:2f:f4:18:46:a0:27:89:cc:4e:68:e0:d5:d4:d9:
+        b0:d4:b1:68:fb:dd:d7:9e:9b:2a:3b:08:cf:d3:bc:f4:b9:9c:
+        75:3c:70:7c:25:6c:b1:fa:b0:8c:6f:bd:cc:e8:ff:a3:e2:4a:
+        f5:d8:b5:3f:b9:ee:72:2a:0c:03:6f:ec:dc:e3:dc:65:85:d0:
+        8b:4f:b5:b9:cf:40:87:27:9b:7d:2a:b9:4e:16:31:16:7f:69:
+        21:e3:ad:f4
 -----BEGIN CERTIFICATE-----
-MIIDgTCCAmkCFF0zzIzfPN0/H/6D9mvlBWGBkcCIMA0GCSqGSIb3DQEBCwUAMH0x
-CzAJBgNVBAYTAlVTMRAwDgYDVQQIDAdNb250YW5hMRAwDgYDVQQHDAdCb3plbWFu
-MRQwEgYDVQQLDAtFbmdpbmVlcmluZzETMBEGA1UEAwwKKmxvY2FsaG9zdDEfMB0G
-CSqGSIb3DQEJARYQaW5mb0B3b2xmc3NsLmNvbTAeFw0yNDEyMTgyMTI1MzFaFw0y
-NzA5MTQyMTI1MzFaMH0xCzAJBgNVBAYTAlVTMRAwDgYDVQQIDAdNb250YW5hMRAw
-DgYDVQQHDAdCb3plbWFuMRQwEgYDVQQLDAtFbmdpbmVlcmluZzETMBEGA1UEAwwK
-KmxvY2FsaG9zdDEfMB0GCSqGSIb3DQEJARYQaW5mb0B3b2xmc3NsLmNvbTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMCVCOFXQfJxbbfSRUEnAWXGRa7y
-vCQwuJXOL07W9hyIvHyf+6hnf/5cnFF194rKB+c1L4/hvXvAL3yrZKgX/Mpde7rg
-IeVyLm8uhtiVc9qsG1O5Xz/XGQ0lT+FjY1GLC2Q/rUO4pRxcNLOuAKBjxfZ/C1lo
-eHOmjBipAm2vwxkBLrgQ48bMQLRpo0YzaYduxLsXpvPo3a1zvHsvIbX9ZlEMvVSz
-4W1fHLwjc9EJA4kU0hC5ZMMq0KGWSrzh1Bpbx6DAwWN4D0Q3MDKWgDIjlaF3uhPS
-l3PiXSXJag3DOWCktLBpQkIJ6dgIvDMgs1gip6rrxOHmYYPF0pbf2dBPrdcCAwEA
-ATANBgkqhkiG9w0BAQsFAAOCAQEAfO2ZCfunDGf0MaIMD7lShvq24/XP1m9nHbCK
-3B4/fW1A87/nqleKepLoAzls5efzhURTiHHtKmHJ32PQWBOTCMZGXF7FdzS1Efcd
-l9GmdvRmPCGbC5Tza5Kl0Uffskcccj0MmP5DXT/NQ+mf8ihBMpXITlisu8ci1GSR
-FnlBPXpTw8vsbz6QfIjxxNrFZlN+msu9rUJiGZK7rKR9ev1CLCMrcw4nK9GqhmL6
-bmCAwsM7s/O6ngTbKKSquVlM4E+0AJ7VLfzG2iStNst0uuNiETLSHrA2r7v8a/jd
-pfHlFLDSxE0qOwCV1GN5XWLxmPtriPy/cLOfl7VcRSJqeUA75w==
+MIIDqTCCApGgAwIBAgIUV1gdb/9pwkNDpvLZEcOPcX/2w+4wDQYJKoZIhvcNAQEL
+BQAwfTELMAkGA1UEBhMCVVMxEDAOBgNVBAgMB01vbnRhbmExEDAOBgNVBAcMB0Jv
+emVtYW4xFDASBgNVBAsMC0VuZ2luZWVyaW5nMRMwEQYDVQQDDAoqbG9jYWxob3N0
+MR8wHQYJKoZIhvcNAQkBFhBpbmZvQHdvbGZzc2wuY29tMB4XDTI0MTIxODIzMTEy
+M1oXDTI3MDkxNDIzMTEyM1owfTELMAkGA1UEBhMCVVMxEDAOBgNVBAgMB01vbnRh
+bmExEDAOBgNVBAcMB0JvemVtYW4xFDASBgNVBAsMC0VuZ2luZWVyaW5nMRMwEQYD
+VQQDDAoqbG9jYWxob3N0MR8wHQYJKoZIhvcNAQkBFhBpbmZvQHdvbGZzc2wuY29t
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwJUI4VdB8nFtt9JFQScB
+ZcZFrvK8JDC4lc4vTtb2HIi8fJ/7qGd//lycUXX3isoH5zUvj+G9e8AvfKtkqBf8
+yl17uuAh5XIuby6G2JVz2qwbU7lfP9cZDSVP4WNjUYsLZD+tQ7ilHFw0s64AoGPF
+9n8LWWh4c6aMGKkCba/DGQEuuBDjxsxAtGmjRjNph27Euxem8+jdrXO8ey8htf1m
+UQy9VLPhbV8cvCNz0QkDiRTSELlkwyrQoZZKvOHUGlvHoMDBY3gPRDcwMpaAMiOV
+oXe6E9KXc+JdJclqDcM5YKS0sGlCQgnp2Ai8MyCzWCKnquvE4eZhg8XSlt/Z0E+t
+1wIDAQABoyEwHzAdBgNVHQ4EFgQUsxEyyZKYhOLJ+NA7bgNCyh8OjjwwDQYJKoZI
+hvcNAQELBQADggEBALZ/xg7QbPkO311xygz+I2sU8g7BwmAXy8n0DjlSuY1xcbHZ
+LcsMrxdkJ2MQTyWWvE7sZ0q/AYrXvWBJ9EF0wkg+70os6cC7Xys4LiS3QPC+XFcj
+v0YSqEd4DS92/J0745NAJRgrZN8T8dsmcj2MxLjp3GD8OkjeWIDJig2oFLKBXgC1
+pg6iyAZO1Qo7N2tk2HcrCQpE9L3IUXgpbeFdrqMEREXc1eov9BhGoCeJzE5o4NXU
+2bDUsWj73deemyo7CM/TvPS5nHU8cHwlbLH6sIxvvczo/6PiSvXYtT+57nIqDANv
+7Nzj3GWF0ItPtbnPQIcnm30quU4WMRZ/aSHjrfQ=
 -----END CERTIFICATE-----
diff --git a/certs/test/server-localhost.der b/certs/test/server-localhost.der
index 7fe821759..5384ee9c8 100644
Binary files a/certs/test/server-localhost.der and b/certs/test/server-localhost.der differ
diff --git a/certs/test/server-localhost.pem b/certs/test/server-localhost.pem
index c04130dec..569426d83 100644
--- a/certs/test/server-localhost.pem
+++ b/certs/test/server-localhost.pem
@@ -2,12 +2,12 @@ Certificate:
     Data:
         Version: 3 (0x2)
         Serial Number:
-            24:cb:51:55:1d:90:15:77:b5:32:b7:bf:a3:49:33:10:da:e0:c0:eb
+            6b:d5:4f:73:be:43:aa:47:d4:ce:30:d4:5b:39:58:1e:05:94:6d:48
         Signature Algorithm: sha256WithRSAEncryption
         Issuer: C = US, ST = Montana, L = Bozeman, OU = Engineering, CN = localhost, emailAddress = info@wolfssl.com
         Validity
-            Not Before: Dec 18 21:25:31 2024 GMT
-            Not After : Sep 14 21:25:31 2027 GMT
+            Not Before: Dec 18 23:11:23 2024 GMT
+            Not After : Sep 14 23:11:23 2027 GMT
         Subject: C = US, ST = Montana, L = Bozeman, OU = Engineering, CN = localhost, emailAddress = info@wolfssl.com
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
@@ -39,27 +39,27 @@ Certificate:
                 B3:11:32:C9:92:98:84:E2:C9:F8:D0:3B:6E:03:42:CA:1F:0E:8E:3C
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        bf:66:23:d9:47:91:2d:de:23:99:2d:55:5c:52:0e:b1:54:fa:
-        40:b1:7d:f7:ec:e2:26:0d:99:dd:b9:e0:d4:8a:d9:9a:b0:38:
-        10:e5:fa:4b:6b:7f:b7:2c:d8:24:bb:df:99:b9:e5:3c:19:e9:
-        bb:07:7d:35:4f:b2:eb:a3:09:83:4b:b0:24:73:61:07:f5:61:
-        1c:17:0b:7b:80:7f:c6:6f:2c:e0:7d:87:ef:d5:25:df:fb:12:
-        2b:50:17:e1:e5:b0:3e:51:c8:16:5c:f1:79:d0:c3:0b:a4:38:
-        a8:fb:e1:57:82:88:c0:ce:90:99:48:b6:45:d1:c7:a2:d8:09:
-        e4:0b:27:a2:88:85:c2:c3:0c:a3:02:6f:d6:24:49:6a:36:a7:
-        9a:01:df:7f:14:75:85:11:ce:6d:83:24:b4:45:1b:d8:ce:18:
-        c5:a1:8a:0b:93:dc:24:c5:68:55:45:09:85:45:7d:d4:55:13:
-        a6:61:2d:c3:e8:4d:49:ee:fb:ac:97:8b:6a:7a:9a:76:ee:12:
-        83:3d:f5:f8:a3:97:3e:7e:63:55:dd:f1:10:72:f0:64:e8:e7:
-        46:d9:02:8b:f8:a3:41:b9:f1:80:c5:80:56:b9:16:f6:20:47:
-        dc:15:03:c4:64:34:49:a2:20:05:05:cd:68:84:75:a2:8f:1a:
-        b1:6e:bc:ce
+        5b:8e:ee:b0:95:5c:91:e1:60:2f:ad:7e:c4:57:50:5f:32:4c:
+        77:3c:2f:db:a2:ad:75:15:02:e1:3f:10:d5:3f:8c:4f:47:91:
+        5c:3e:dd:98:15:52:a9:bf:57:65:f6:2a:40:64:07:89:4a:38:
+        10:fd:54:e8:70:32:bd:f0:fe:cf:82:67:f4:4b:b5:18:aa:95:
+        c8:2f:8f:75:7a:33:dc:9f:5e:82:5e:38:eb:2b:45:1d:95:ea:
+        62:74:56:b4:ce:a2:eb:90:c3:42:6c:31:4e:30:d7:d1:3c:85:
+        81:1b:82:f0:58:0e:be:55:da:ab:2c:69:4d:6f:e5:8d:af:fe:
+        7d:ad:a9:62:a2:b5:ab:29:a7:f7:0c:78:12:ed:a3:db:32:99:
+        41:90:11:4e:ee:97:99:0a:b6:89:19:c7:dd:1c:98:bf:d4:c4:
+        8a:6b:0b:52:8a:0a:e9:c5:96:be:cc:95:9c:78:27:b8:5b:41:
+        d8:05:47:0c:99:49:21:b0:26:76:6f:bc:7b:a0:b3:75:77:05:
+        95:a5:4a:28:4a:8e:f6:4a:07:6b:f9:26:a3:4f:f2:9e:de:af:
+        52:3e:36:30:57:f8:13:6b:66:a9:20:26:55:d1:e4:62:54:0c:
+        dd:a7:7d:4a:66:5f:af:53:98:53:c6:72:57:4c:15:5f:c4:08:
+        3c:ed:1d:30
 -----BEGIN CERTIFICATE-----
-MIIDvTCCAqWgAwIBAgIUJMtRVR2QFXe1Mre/o0kzENrgwOswDQYJKoZIhvcNAQEL
+MIIDvTCCAqWgAwIBAgIUa9VPc75DqkfUzjDUWzlYHgWUbUgwDQYJKoZIhvcNAQEL
 BQAwfDELMAkGA1UEBhMCVVMxEDAOBgNVBAgMB01vbnRhbmExEDAOBgNVBAcMB0Jv
 emVtYW4xFDASBgNVBAsMC0VuZ2luZWVyaW5nMRIwEAYDVQQDDAlsb2NhbGhvc3Qx
-HzAdBgkqhkiG9w0BCQEWEGluZm9Ad29sZnNzbC5jb20wHhcNMjQxMjE4MjEyNTMx
-WhcNMjcwOTE0MjEyNTMxWjB8MQswCQYDVQQGEwJVUzEQMA4GA1UECAwHTW9udGFu
+HzAdBgkqhkiG9w0BCQEWEGluZm9Ad29sZnNzbC5jb20wHhcNMjQxMjE4MjMxMTIz
+WhcNMjcwOTE0MjMxMTIzWjB8MQswCQYDVQQGEwJVUzEQMA4GA1UECAwHTW9udGFu
 YTEQMA4GA1UEBwwHQm96ZW1hbjEUMBIGA1UECwwLRW5naW5lZXJpbmcxEjAQBgNV
 BAMMCWxvY2FsaG9zdDEfMB0GCSqGSIb3DQEJARYQaW5mb0B3b2xmc3NsLmNvbTCC
 ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMCVCOFXQfJxbbfSRUEnAWXG
@@ -69,11 +69,11 @@ C1loeHOmjBipAm2vwxkBLrgQ48bMQLRpo0YzaYduxLsXpvPo3a1zvHsvIbX9ZlEM
 vVSz4W1fHLwjc9EJA4kU0hC5ZMMq0KGWSrzh1Bpbx6DAwWN4D0Q3MDKWgDIjlaF3
 uhPSl3PiXSXJag3DOWCktLBpQkIJ6dgIvDMgs1gip6rrxOHmYYPF0pbf2dBPrdcC
 AwEAAaM3MDUwFAYDVR0RBA0wC4IJbG9jYWxob3N0MB0GA1UdDgQWBBSzETLJkpiE
-4sn40DtuA0LKHw6OPDANBgkqhkiG9w0BAQsFAAOCAQEAv2Yj2UeRLd4jmS1VXFIO
-sVT6QLF99+ziJg2Z3bng1IrZmrA4EOX6S2t/tyzYJLvfmbnlPBnpuwd9NU+y66MJ
-g0uwJHNhB/VhHBcLe4B/xm8s4H2H79Ul3/sSK1AX4eWwPlHIFlzxedDDC6Q4qPvh
-V4KIwM6QmUi2RdHHotgJ5AsnooiFwsMMowJv1iRJajanmgHffxR1hRHObYMktEUb
-2M4YxaGKC5PcJMVoVUUJhUV91FUTpmEtw+hNSe77rJeLanqadu4Sgz31+KOXPn5j
-Vd3xEHLwZOjnRtkCi/ijQbnxgMWAVrkW9iBH3BUDxGQ0SaIgBQXNaIR1oo8asW68
-zg==
+4sn40DtuA0LKHw6OPDANBgkqhkiG9w0BAQsFAAOCAQEAW47usJVckeFgL61+xFdQ
+XzJMdzwv26KtdRUC4T8Q1T+MT0eRXD7dmBVSqb9XZfYqQGQHiUo4EP1U6HAyvfD+
+z4Jn9Eu1GKqVyC+PdXoz3J9egl446ytFHZXqYnRWtM6i65DDQmwxTjDX0TyFgRuC
+8FgOvlXaqyxpTW/lja/+fa2pYqK1qymn9wx4Eu2j2zKZQZARTu6XmQq2iRnH3RyY
+v9TEimsLUooK6cWWvsyVnHgnuFtB2AVHDJlJIbAmdm+8e6CzdXcFlaVKKEqO9koH
+a/kmo0/ynt6vUj42MFf4E2tmqSAmVdHkYlQM3ad9SmZfr1OYU8ZyV0wVX8QIPO0d
+MA==
 -----END CERTIFICATE-----