(tomcat) branch 9.0.x updated: Revert "Regenerate TLS certificates, keys etc"

[email protected]
Newsgroups gmane.comp.jakarta.tomcat.devel
Message-ID <178656347616.2602572.12995106682212637566@gitbox3-he-fi.apache.org>
This is an automated email from the ASF dual-hosted git repository.

rmaucher pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/9.0.x by this push:
     new 9061d99e49 Revert "Regenerate TLS certificates, keys etc"
9061d99e49 is described below

commit 9061d99e49f49f1407dad7e5de54a712d6cf3d49
Author: remm <[email protected]>
AuthorDate: Wed Aug 12 21:37:19 2026 +0200

    Revert "Regenerate TLS certificates, keys etc"
    
    This reverts commit 30acd48b4f73973f56430c48a257985725999263.
---
 test/org/apache/tomcat/util/net/ca-cert.pem        |  58 ++++----
 test/org/apache/tomcat/util/net/ca.jks             | Bin 1793 -> 1793 bytes
 test/org/apache/tomcat/util/net/index.db           |  14 +-
 .../tomcat/util/net/localhost-crl-rsa-cert.pem     | 150 ++++++++++-----------
 .../tomcat/util/net/localhost-crl-rsa-key.pem      |  52 +++----
 .../apache/tomcat/util/net/localhost-crl-rsa.jks   | Bin 2771 -> 2737 bytes
 .../apache/tomcat/util/net/localhost-ec-cert.pem   | 119 ++++++++--------
 .../apache/tomcat/util/net/localhost-ec-key.pem    |  13 +-
 test/org/apache/tomcat/util/net/localhost-ec.jks   | Bin 1459 -> 1424 bytes
 .../apache/tomcat/util/net/localhost-rsa-cert.pem  | 150 ++++++++++-----------
 .../apache/tomcat/util/net/localhost-rsa-copy1.jks | Bin 2771 -> 2735 bytes
 .../apache/tomcat/util/net/localhost-rsa-key.pem   |  52 +++----
 test/org/apache/tomcat/util/net/localhost-rsa.jks  | Bin 4516 -> 4480 bytes
 .../tomcat/util/net/ocsp-responder-rsa-cert.pem    | 146 ++++++++++----------
 .../tomcat/util/net/ocsp-responder-rsa-key.pem     |  52 +++----
 test/org/apache/tomcat/util/net/user1.jks          | Bin 4496 -> 4460 bytes
 test/org/apache/tomcat/util/net/user2-crl.jks      | Bin 2752 -> 2715 bytes
 test/org/apache/tomcat/util/net/user3-crl-long.jks | Bin 3036 -> 3035 bytes
 18 files changed, 402 insertions(+), 404 deletions(-)

diff --git a/test/org/apache/tomcat/util/net/ca-cert.pem b/test/org/apache/tomcat/util/net/ca-cert.pem
index 0046e0b179..e8e344f6b1 100644
--- a/test/org/apache/tomcat/util/net/ca-cert.pem
+++ b/test/org/apache/tomcat/util/net/ca-cert.pem
@@ -1,39 +1,39 @@
 -----BEGIN CERTIFICATE-----
-MIIGwjCCBKqgAwIBAgIUMk7UyfrO0VZbN49t+TbPkhln93owDQYJKoZIhvcNAQEL
+MIIGwjCCBKqgAwIBAgIUb23jgHGhJDQJaz0iHUfKwRV5z5kwDQYJKoZIhvcNAQEL
 BQAwgZQxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJERTETMBEGA1UEBxMKV2lsbWlu
 Z3RvbjEnMCUGA1UEChMeVGhlIEFwYWNoZSBTb2Z0d2FyZSBGb3VuZGF0aW9uMRow
 GAYDVQQLExFBcGFjaGUgVG9tY2F0IFBNQzEeMBwGA1UEAxMVQXBhY2hlIFRvbWNh
-dCBUZXN0IENBMB4XDTI2MDgxMjEzMTkxN1oXDTM2MDgwOTEzMTkxN1owgZQxCzAJ
+dCBUZXN0IENBMB4XDTI1MTIwNTE5MTIzOFoXDTM1MTIwMzE5MTIzOFowgZQxCzAJ
 BgNVBAYTAlVTMQswCQYDVQQIEwJERTETMBEGA1UEBxMKV2lsbWluZ3RvbjEnMCUG
 A1UEChMeVGhlIEFwYWNoZSBTb2Z0d2FyZSBGb3VuZGF0aW9uMRowGAYDVQQLExFB
 cGFjaGUgVG9tY2F0IFBNQzEeMBwGA1UEAxMVQXBhY2hlIFRvbWNhdCBUZXN0IENB
-MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAqb4de56kmmMNzHi7icwr
-CvR7P1Qy9Q3fi1XcltGhRhpf/dbt9myItJVjDzG6yF+/T1xuI6hRHmzVkUW3NiFL
-XgAVn4mdHJeVaTLfouF6DdgnarlKu5v3IpjgHGi3j5ihLRUEQRa8aAUDf2qqg3cq
-aArLrwzEpXeO6ApvDSAuCvBiYGFYc+HLzHMruCw6sy9cQbl8UcXORSuIkNY1hQGe
-SSaV+Qgon53eHIyIU4afKMNN5KpGa8bOZoWMtSJTzPjxJ12aA11GiOba0KnIW9CP
-H28uTvAXabb2ahh3t1b7v7A5dl+V6SEcxoaTIuN+1pLeNLTyZhnB45/uEEgXdQNW
-zvPMSz78fXUjSsEG5cepPsFCwdgIHgYYu2qOL9qUGvDZkz4PDm0qReqYhz/NJJ6b
-Pj7CxmOe4UnI2lEXP3IXG+7CsjlEU1RuBk1kXUi9OCGWPGtDtygBfCWa0zymsWgo
-LrMpoJ+3v4gVe7BZ3QLCcCNlAeuNrZ0sB5hssbbqaOOOcqv2/RPV1I02hFz84x9C
-igH8KBuVLhsIX2cYJDDkSy4NrArBzLBuYhIH2q/9zLF3zn2Fy2lyoKnO+pRIJOHG
-ehcOh5XWjLsjuIZwZiorS8Jo2WAG9TYI8txckRYDniy3e+panENxOvIa/1Grvhl/
-Jf5/YfmYU/tSbxn0RkFqEyMCAwEAAaOCAQgwggEEMB0GA1UdDgQWBBTbdmYmmMu/
-aTGZL5VsnsJZPF1NjDCB1AYDVR0jBIHMMIHJgBTbdmYmmMu/aTGZL5VsnsJZPF1N
-jKGBmqSBlzCBlDELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkRFMRMwEQYDVQQHEwpX
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAqeIoIFXsR468dJCUYnNX
+E4DLI9J2jLIz/T1Jiq/tA9XCzA+XFqf3tlZdXLsfQhDLg0lf+wHqQfSvbQ0Gcatn
+Iw8BIvA7yq6PDKsO4cjQ2EdrkTn2JD7hJW5uUB9Je95TUUbKuNxOatihwS4DNU2J
+aoI2R2iUGasXsawVR+4qj1UJByawlsGHxFCqhVoaUKM/fKXK7LllbyHsRxuZTgab
+Spmvj2jcMxyeDN2ZjlBdsrSg+8FpYvnPKzHpdFiA6d4pxU6QJbeDeWPQ6B64yWi1
+eImFvilqZQoQ3RR/1gDjoFuLCdWK7mAvfaSXFzax1YK3D/MiCowTZ8M0iWmGqMg1
+QF6luhPL+5p8Q2/KooE3CZol0IpCUGr3cQs3FC1deL5ySNMYniXQMgxGqVE3x0i1
+Wlf5bItGY0Ha9vc+s4vmnRZxW4O+fXiuG9OXS5XjfWGAjzkJ6wXgFRJKbWDsSPkR
+Sw9j9SAsLE6cycY66eMl94QdOl6KRXVyeaLHJbRMBux7WvDXYS/eWKFHjmPYNKq6
+btIB7ELTqoMuwTAWj83bdkQgMac5fsTozKduM+C63sSg3mhmyy6yVgCX1eECqPNk
+N4K4oWdhQvKYvCp1n1EySAupZqrxudBLp/LDHRfGh7gfAZgP8hxRaoBqh2u0H8Fh
+RwSAML8zEeRH/si3G7LfXzECAwEAAaOCAQgwggEEMB0GA1UdDgQWBBSsh9yLPYrb
+iUh+bzscxnCSCRdv+TCB1AYDVR0jBIHMMIHJgBSsh9yLPYrbiUh+bzscxnCSCRdv
++aGBmqSBlzCBlDELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkRFMRMwEQYDVQQHEwpX
 aWxtaW5ndG9uMScwJQYDVQQKEx5UaGUgQXBhY2hlIFNvZnR3YXJlIEZvdW5kYXRp
 b24xGjAYBgNVBAsTEUFwYWNoZSBUb21jYXQgUE1DMR4wHAYDVQQDExVBcGFjaGUg
-VG9tY2F0IFRlc3QgQ0GCFDJO1Mn6ztFWWzePbfk2z5IZZ/d6MAwGA1UdEwQFMAMB
-Af8wDQYJKoZIhvcNAQELBQADggIBAEcJsGyAWXE48Usq/DEQ3tTrSWepZKNEDMio
-LLDd6myqBM8yLp3aofejQ/izx9d3n4cIbi8GKFNRI1gvbeQqozH+kD9DgVyDN8MU
-XCagpU4ZBvCeIz4Ko8gGI8xAvp7nEJjzRpYYrIHemIzvNnGCa8JZZW1T5SKXO6Or
-CLXy8wgZoc2Z50he/ZqeswHBQcTW7NGnvDMoxc6TXnK3HwcxJtxvq/vg1rLuDuVM
-vluXe++2AbB0fYMvFdxM8fCvyrpartpx8maseDAnwAGBJQVFMJRkDjO6G2dKyQF0
-VLy599AhSeo94+of1RD/y8TQDq8xfw7zEjr2YYpi6Qup8fBqKGYytCuU+Eir4Gj4
-U4QEVIxFdx7UGakum0YK1Tl/s5Gi2pNuqOXuD+ilrh/0uOm8vafFhZJABEChT4K6
-CIh7l/4g9tLWw68WFYkVUYHwbV9XN2n2YG4TJq2/HDetGWbWpnWg6fGm5NYSvcTa
-4psBCP+fiifY7xk56KWdOwXac4+5HDGX+hA3Y5O9ahWy10aE+QC/uUociCxkrh0F
-fRvHiNU5plcYmbsMrtwF2rhxfgSxt+s2qlGRHfRFxX8veLXFEUFWxUGt+acrMgrr
-HYEjjgezwqAjgrP0nFfkU8EKUJxqmd+daghXTTyhy04bzOD/vIdbDWsVh0Ysfg+3
-kkorF8hp
+VG9tY2F0IFRlc3QgQ0GCFG9t44BxoSQ0CWs9Ih1HysEVec+ZMAwGA1UdEwQFMAMB
+Af8wDQYJKoZIhvcNAQELBQADggIBAA/DyqPhxRAluY1e1S9L2SkkrcYePjb033Wl
+ZmMVdXvf6LZtpjquNz81ThNoX5yfgV6CawDRw7COI4dAU3HOLVtOeKybm11Jq1BH
+AWmlZVQIOplgnitoEoZi8brxEpSgeyRGLKHYaW1YxshPRC5tVDKsbyYBtvmTaBtK
+dMirc36cEDkSfEe2dq+MkHgzHyyvySqTSlI/MH7CKQYBjGg2D+Gcle/BNrK02wef
+Rol9M3R3skDfV/P0NFmrfFi4B/cXt/EFxm1thMsQ6ofd0GUMGgv6fJKN1AVDihx6
+sQvbn712+54ilkcWMa3gW5L/BIxcDS+ZZiO/7T2tZ2d3tcz86gYbFkiQbWelnTmn
+FBSHno9PDgxRWZzqauKqlsczAsz5qLf8zF+GDubEcxvOgEf0wQ/vPwtSb2R4egb+
+3Vn+InqDy9/78ug497KV842jxQy2G6wZLND0q81H04t8NYQopbX4DI0hS5BJnKuV
+TM3rh4C/hNXs8kUpjusqnnV8nbBpab2R1YzEOefhgtTFdk/dHI7a5+6BKNSK55yn
+hDqgemD5p+5A6FLu3M0RDgbTZ1WdrtYDvQZrAMB10mrV0YDoDgnEzGYEc/PQwkYF
+gOeqb97mOdjf9YUJli4S4XLkZ5zn/IitEQRbnKen2VE60qIgW/UMYKTiwuSZtRaW
+gxBAeoi3
 -----END CERTIFICATE-----
diff --git a/test/org/apache/tomcat/util/net/ca.jks b/test/org/apache/tomcat/util/net/ca.jks
index 7e5cba7937..d740b45124 100644
Binary files a/test/org/apache/tomcat/util/net/ca.jks and b/test/org/apache/tomcat/util/net/ca.jks differ
diff --git a/test/org/apache/tomcat/util/net/index.db b/test/org/apache/tomcat/util/net/index.db
index f34f45d74f..f873a5341d 100644
--- a/test/org/apache/tomcat/util/net/index.db
+++ b/test/org/apache/tomcat/util/net/index.db
@@ -1,7 +1,7 @@
-V	280811131918Z		1000	unknown	/C=US/ST=DE/L=Wilmington/O=The Apache Software Foundation/OU=Apache Tomcat PMC/CN=localhost
-R	280811131918Z	260812131922Z	1001	unknown	/C=US/ST=DE/L=Wilmington/O=The Apache Software Foundation/OU=Apache Tomcat PMC/CN=localhost
-V	280811131918Z		1002	unknown	/C=US/ST=DE/L=Wilmington/O=The Apache Software Foundation/OU=Apache Tomcat PMC/CN=user1
-R	280811131918Z	260812131922Z	1003	unknown	/C=US/ST=DE/L=Wilmington/O=The Apache Software Foundation/OU=Apache Tomcat PMC/CN=user2
-V	280811131918Z		1004	unknown	/C=US/ST=DE/L=Wilmington/O=The Apache Software Foundation/OU=Apache Tomcat PMC/CN=localhost
-V	280811131918Z		1005	unknown	/C=US/ST=DE/L=Wilmington/O=The Apache Software Foundation/OU=Apache Tomcat PMC/CN=OCSP Responder
-R	280811131918Z	260812131922Z	1006	unknown	/C=US/ST=DE/L=Wilmington/O=The Apache Software Foundation/OU=Apache Tomcat PMC/CN=user3
+V	271205191323Z		1000	unknown	/C=US/ST=DE/L=Wilmington/O=The Apache Software Foundation/OU=Apache Tomcat PMC/CN=localhost
+R	271205191327Z	251205192921Z	1001	unknown	/C=US/ST=DE/L=Wilmington/O=The Apache Software Foundation/OU=Apache Tomcat PMC/CN=localhost
+V	271205191331Z		1002	unknown	/C=US/ST=DE/L=Wilmington/O=The Apache Software Foundation/OU=Apache Tomcat PMC/CN=user1
+R	271205191335Z	251205192924Z	1003	unknown	/C=US/ST=DE/L=Wilmington/O=The Apache Software Foundation/OU=Apache Tomcat PMC/CN=user2
+V	271205191540Z		1004	unknown	/C=US/ST=DE/L=Wilmington/O=The Apache Software Foundation/OU=Apache Tomcat PMC/CN=localhost
+V	271205193355Z		1005	unknown	/C=US/ST=DE/L=Wilmington/O=The Apache Software Foundation/OU=Apache Tomcat PMC/CN=OCSP Responder
+R	271210104820Z	251210105017Z	1006	unknown	/C=US/ST=DE/L=Wilmington/O=The Apache Software Foundation/OU=Apache Tomcat PMC/CN=user3
diff --git a/test/org/apache/tomcat/util/net/localhost-crl-rsa-cert.pem b/test/org/apache/tomcat/util/net/localhost-crl-rsa-cert.pem
index 957d035f18..7cfe515a25 100644
--- a/test/org/apache/tomcat/util/net/localhost-crl-rsa-cert.pem
+++ b/test/org/apache/tomcat/util/net/localhost-crl-rsa-cert.pem
@@ -5,31 +5,31 @@ Certificate:
         Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=US, ST=DE, L=Wilmington, O=The Apache Software Foundation, OU=Apache Tomcat PMC, CN=Apache Tomcat Test CA
         Validity
-            Not Before: Aug 12 13:19:18 2026 GMT
-            Not After : Aug 11 13:19:18 2028 GMT
+            Not Before: Dec  5 19:13:27 2025 GMT
+            Not After : Dec  5 19:13:27 2027 GMT
         Subject: C=US, ST=DE, L=Wilmington, O=The Apache Software Foundation, OU=Apache Tomcat PMC, CN=localhost
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
                 Public-Key: (2048 bit)
                 Modulus:
-                    00:8d:ac:30:c9:fc:2a:f8:66:e5:e8:3a:77:05:f2:
-                    76:0d:d5:e3:89:bb:a6:cd:35:f5:2f:81:96:02:e3:
-                    70:d8:e0:49:4b:52:e8:82:58:9d:03:0f:10:df:f3:
-                    2e:c4:1d:67:27:8e:85:e9:44:17:82:8f:ab:08:a1:
-                    01:e1:d3:dc:e9:73:79:12:b0:b2:a4:a3:db:df:58:
-                    d2:52:7b:0b:b9:ac:95:3c:66:94:92:70:84:3d:35:
-                    63:9f:86:e6:ac:aa:97:59:86:98:45:d5:84:e0:24:
-                    41:3d:1d:bf:58:df:c4:d2:cd:f7:3f:e8:30:97:eb:
-                    6a:99:23:7d:dd:ed:a8:09:a0:e2:bd:97:03:dc:8c:
-                    d1:fd:5e:83:6b:2f:37:ca:c8:a7:a2:84:23:dc:65:
-                    e0:95:1d:01:d1:e9:e8:35:17:e5:d0:84:68:95:48:
-                    35:d8:51:b0:57:42:22:ab:91:ed:e3:57:50:5c:90:
-                    4a:b6:0e:aa:52:df:54:0e:a2:46:a5:76:71:08:ec:
-                    fb:52:a6:5b:83:96:4b:3b:0b:32:8b:32:89:1b:9a:
-                    be:c7:74:8a:cd:8c:2b:ab:86:d1:96:ed:66:68:fa:
-                    73:a8:6c:5f:a3:e7:9a:56:7f:9c:6a:0a:14:e7:92:
-                    90:1b:29:2d:99:4c:ad:7b:07:fc:99:68:ca:07:74:
-                    c0:0d
+                    00:aa:f2:ee:01:dd:21:fd:4b:f6:1e:9f:a1:a6:65:
+                    42:71:1c:db:cf:d7:47:6d:20:81:63:01:c7:6c:a2:
+                    5a:2e:17:0d:5d:d9:60:78:e5:d9:2a:9a:c0:2d:1c:
+                    2d:24:9d:b3:f6:26:a9:93:80:86:ad:0e:b0:06:4e:
+                    64:dc:11:da:70:a0:eb:47:aa:9d:39:3e:10:1c:b5:
+                    fe:bc:ca:b2:5b:b8:3f:0c:a8:d4:b3:cb:9e:dd:f5:
+                    19:0e:dc:83:34:54:1d:17:b9:0d:2e:5d:4c:31:d7:
+                    9b:64:e9:40:89:de:77:75:ad:6e:86:3e:46:15:88:
+                    ed:48:88:bb:a2:77:a5:05:4a:33:33:3e:bb:cb:7b:
+                    f7:00:9b:eb:4e:2b:f5:4a:59:07:ff:18:5a:a1:49:
+                    c2:25:48:21:03:55:64:da:d7:75:0f:e8:55:a8:61:
+                    39:ca:af:09:64:c2:c1:67:4b:ec:95:df:66:50:2d:
+                    39:45:d6:4c:8d:07:a8:3d:d1:fc:3c:46:76:92:2f:
+                    1a:b0:27:f0:0c:e8:19:2b:c6:b4:ad:62:c4:c6:21:
+                    7c:23:17:c4:13:a4:0e:7d:d3:05:3b:0b:43:ab:43:
+                    32:88:12:67:91:1b:01:e4:98:90:fc:67:88:d7:8b:
+                    8e:6b:f0:2a:59:62:d1:dc:24:38:28:8c:b7:e9:1b:
+                    7b:27
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Basic Constraints: 
@@ -37,74 +37,72 @@ Certificate:
             Netscape Comment: 
                 OpenSSL Generated Certificate
             X509v3 Subject Key Identifier: 
-                CB:8C:C3:8A:9D:35:A2:8F:8F:5D:C4:CD:EF:6B:1A:9E:CA:E2:48:2F
+                CB:A6:D2:18:07:CE:1A:E1:A7:F1:DC:FB:4C:A0:2C:85:AE:A5:40:A2
             X509v3 Authority Key Identifier: 
-                DB:76:66:26:98:CB:BF:69:31:99:2F:95:6C:9E:C2:59:3C:5D:4D:8C
+                AC:87:DC:8B:3D:8A:DB:89:48:7E:6F:3B:1C:C6:70:92:09:17:6F:F9
             Authority Information Access: 
                 OCSP - URI:http://127.0.0.1:8888
-                OCSP - URI:http://127.0.0.1:8889
             X509v3 Subject Alternative Name: 
                 DNS:localhost, IP Address:127.0.0.1
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        71:bf:2f:7b:bf:69:dc:d6:07:c8:26:ae:03:2b:f1:5a:67:87:
-        3c:33:7f:e9:cd:82:1f:42:0e:d4:b7:80:b4:57:95:78:8c:f0:
-        8c:1c:de:de:12:b3:81:af:a5:a3:da:d1:55:d4:08:20:b9:b3:
-        5d:df:2f:d5:12:62:de:f7:dd:6f:e5:75:3d:6b:5d:31:66:94:
-        31:b7:a8:ea:34:7d:b8:af:82:bb:cd:4d:95:bc:fb:d6:46:ab:
-        b7:af:7b:32:7d:49:c4:85:6b:db:df:6d:9f:b4:31:c0:15:19:
-        25:3b:ac:21:b2:92:89:1d:04:09:1c:1b:11:23:af:49:8c:27:
-        32:32:6a:19:0e:4b:ec:e8:e5:3f:a2:19:50:e6:11:19:a4:cd:
-        65:fa:76:56:51:e7:de:c0:6e:16:ec:7a:8e:84:8c:c8:e6:13:
-        be:f9:ff:40:89:fb:fc:3a:67:6b:1f:ec:ed:57:5a:9a:49:9c:
-        57:18:6a:15:4a:df:a6:88:33:fd:ab:8d:36:f3:be:56:d1:29:
-        28:fd:fe:69:47:74:47:be:74:9f:c2:92:d7:11:08:54:0b:c7:
-        04:98:cb:43:c8:99:c0:fb:0a:ed:44:1c:62:e8:ae:c2:90:1a:
-        66:29:8b:25:84:5d:f3:33:58:b6:56:f0:3f:1d:3d:43:a5:15:
-        de:cb:50:1d:b7:0e:83:3f:f8:a2:ea:01:29:a9:df:6a:13:e1:
-        ea:c9:87:5f:c6:f4:ce:68:78:a8:9b:bc:c8:8d:6d:52:09:a2:
-        9c:31:9f:c0:07:02:c8:0a:51:0a:16:3e:f8:ef:06:6d:7e:8a:
-        25:b0:69:c0:d3:8f:d7:e2:6f:59:e6:c5:f8:c1:bd:68:57:de:
-        de:56:59:a8:11:fc:20:6d:66:99:68:87:26:9b:b4:15:bf:71:
-        63:06:28:32:92:dc:09:eb:e1:48:cb:d6:79:0e:b2:53:ab:ea:
-        29:7d:ba:f6:ee:a8:a2:14:91:55:1a:bc:a9:55:32:b9:64:50:
-        87:3e:06:66:c3:d4:fd:77:91:e5:72:4d:4e:28:f7:fa:4e:8f:
-        39:05:7b:86:07:3b:6b:8b:3b:4b:45:91:52:07:35:6f:f3:42:
-        7f:ac:a4:2f:68:f8:ef:22:78:92:32:77:80:39:d1:5e:2e:82:
-        a7:2f:8f:c2:e1:f6:46:9e:de:6f:e0:23:03:71:6e:8c:9b:84:
-        ef:d5:f6:c2:81:ea:9b:66:21:b8:0a:10:a5:04:f7:95:1c:ef:
-        6e:16:cf:47:29:7c:05:b4:18:6e:50:07:32:9c:1f:b2:69:61:
-        f2:a8:a8:9c:5a:c1:52:0f:26:e8:68:e4:8f:17:ba:86:bf:23:
-        f1:7a:55:d0:24:87:c6:22
+        11:8b:03:aa:50:38:53:88:71:66:01:2f:d5:ab:82:49:ba:4d:
+        45:5a:20:b6:f7:6e:1f:ca:77:ce:f7:93:85:ec:4d:da:ba:17:
+        71:dc:30:7b:7f:55:35:07:88:a2:4a:47:06:9c:8c:1b:a0:33:
+        5f:46:dd:c9:c6:f5:0e:27:48:6e:1f:0b:a0:e8:17:e4:16:3b:
+        d0:e3:0b:56:4f:5c:5f:b7:ae:fb:da:46:13:0b:fc:e8:3d:72:
+        7e:ab:2d:19:4d:6c:09:8b:32:51:9a:7a:b8:49:70:7e:ce:ce:
+        78:7f:95:9c:3a:8e:05:cc:29:af:0b:de:42:b8:cd:5e:56:a8:
+        2f:78:ea:19:67:ed:a7:59:c0:ce:0a:4c:50:46:67:9a:6e:72:
+        6b:fd:ae:00:a6:2f:9a:93:97:39:58:06:b4:05:a3:78:a9:b6:
+        df:66:22:0d:ae:5b:fd:e8:37:78:25:ac:2e:5a:a0:65:56:3e:
+        83:04:bf:98:96:30:e1:11:f9:da:3b:6a:97:c4:77:28:d6:d7:
+        46:27:a4:05:67:2e:f5:b8:d4:2e:c7:00:39:49:08:9b:a7:58:
+        21:48:4c:fb:8f:dd:99:69:ea:59:bc:41:96:fd:1a:29:1a:fe:
+        53:16:6a:2b:ac:92:51:18:ac:85:d9:7d:d5:77:ad:60:63:98:
+        47:2c:52:ec:85:ef:ad:ff:b0:58:d7:12:7b:6f:70:2b:93:2a:
+        92:f8:99:3c:15:7a:26:d4:79:16:05:93:9a:f4:01:bc:e6:9b:
+        a0:31:c3:d7:12:23:47:12:81:30:02:06:0c:13:ca:38:4c:63:
+        96:2d:17:41:53:06:8b:c5:a3:8c:c3:96:b7:e2:b5:85:49:f7:
+        cd:46:01:21:ff:4f:d1:65:be:37:1b:84:7c:79:a6:e1:a8:a8:
+        d7:8c:63:34:35:45:d5:42:10:03:0f:60:fa:52:c5:39:03:26:
+        b1:41:6c:b9:53:3c:cf:8d:5d:fa:02:ac:0a:7a:04:27:28:df:
+        33:b2:01:69:d8:3e:72:38:57:60:d3:a8:47:5f:98:55:8c:55:
+        15:36:58:6e:c7:fc:65:a5:f8:c7:7f:1a:8c:de:b7:79:21:50:
+        98:76:69:8a:b3:48:b0:1d:b2:91:fd:25:8f:bd:59:17:81:22:
+        bc:67:32:d5:fb:e6:c3:cd:3c:b3:79:6f:cd:1c:4a:b0:04:13:
+        3c:af:80:53:7c:f0:c6:28:f3:37:3e:36:4d:65:ef:38:dc:00:
+        5f:88:7e:04:34:75:66:fa:ba:6c:1f:76:b2:55:bb:21:60:fe:
+        b8:48:f8:ac:cb:6e:16:2f:75:87:44:d0:c3:6d:d5:6a:e1:e6:
+        b9:32:7e:39:a6:e6:d0:7f
 -----BEGIN CERTIFICATE-----
-MIIFiTCCA3GgAwIBAgICEAEwDQYJKoZIhvcNAQELBQAwgZQxCzAJBgNVBAYTAlVT
+MIIFZjCCA06gAwIBAgICEAEwDQYJKoZIhvcNAQELBQAwgZQxCzAJBgNVBAYTAlVT
 MQswCQYDVQQIEwJERTETMBEGA1UEBxMKV2lsbWluZ3RvbjEnMCUGA1UEChMeVGhl
 IEFwYWNoZSBTb2Z0d2FyZSBGb3VuZGF0aW9uMRowGAYDVQQLExFBcGFjaGUgVG9t
-Y2F0IFBNQzEeMBwGA1UEAxMVQXBhY2hlIFRvbWNhdCBUZXN0IENBMB4XDTI2MDgx
-MjEzMTkxOFoXDTI4MDgxMTEzMTkxOFowgYgxCzAJBgNVBAYTAlVTMQswCQYDVQQI
+Y2F0IFBNQzEeMBwGA1UEAxMVQXBhY2hlIFRvbWNhdCBUZXN0IENBMB4XDTI1MTIw
+NTE5MTMyN1oXDTI3MTIwNTE5MTMyN1owgYgxCzAJBgNVBAYTAlVTMQswCQYDVQQI
 EwJERTETMBEGA1UEBxMKV2lsbWluZ3RvbjEnMCUGA1UEChMeVGhlIEFwYWNoZSBT
 b2Z0d2FyZSBGb3VuZGF0aW9uMRowGAYDVQQLExFBcGFjaGUgVG9tY2F0IFBNQzES
 MBAGA1UEAxMJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAjawwyfwq+Gbl6Dp3BfJ2DdXjibumzTX1L4GWAuNw2OBJS1LoglidAw8Q3/Mu
-xB1nJ46F6UQXgo+rCKEB4dPc6XN5ErCypKPb31jSUnsLuayVPGaUknCEPTVjn4bm
-rKqXWYaYRdWE4CRBPR2/WN/E0s33P+gwl+tqmSN93e2oCaDivZcD3IzR/V6Day83
-ysinooQj3GXglR0B0enoNRfl0IRolUg12FGwV0Iiq5Ht41dQXJBKtg6qUt9UDqJG
-pXZxCOz7UqZbg5ZLOwsyizKJG5q+x3SKzYwrq4bRlu1maPpzqGxfo+eaVn+cagoU
-55KQGyktmUytewf8mWjKB3TADQIDAQABo4HuMIHrMAkGA1UdEwQCMAAwLAYJYIZI
+AQEAqvLuAd0h/Uv2Hp+hpmVCcRzbz9dHbSCBYwHHbKJaLhcNXdlgeOXZKprALRwt
+JJ2z9iapk4CGrQ6wBk5k3BHacKDrR6qdOT4QHLX+vMqyW7g/DKjUs8ue3fUZDtyD
+NFQdF7kNLl1MMdebZOlAid53da1uhj5GFYjtSIi7onelBUozMz67y3v3AJvrTiv1
+SlkH/xhaoUnCJUghA1Vk2td1D+hVqGE5yq8JZMLBZ0vsld9mUC05RdZMjQeoPdH8
+PEZ2ki8asCfwDOgZK8a0rWLExiF8IxfEE6QOfdMFOwtDq0MyiBJnkRsB5JiQ/GeI
+14uOa/AqWWLR3CQ4KIy36Rt7JwIDAQABo4HLMIHIMAkGA1UdEwQCMAAwLAYJYIZI
 AYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQW
-BBTLjMOKnTWij49dxM3vaxqeyuJILzAfBgNVHSMEGDAWgBTbdmYmmMu/aTGZL5Vs
-nsJZPF1NjDBUBggrBgEFBQcBAQRIMEYwIQYIKwYBBQUHMAGGFWh0dHA6Ly8xMjcu
-MC4wLjE6ODg4ODAhBggrBgEFBQcwAYYVaHR0cDovLzEyNy4wLjAuMTo4ODg5MBoG
-A1UdEQQTMBGCCWxvY2FsaG9zdIcEfwAAATANBgkqhkiG9w0BAQsFAAOCAgEAcb8v
-e79p3NYHyCauAyvxWmeHPDN/6c2CH0IO1LeAtFeVeIzwjBze3hKzga+lo9rRVdQI
-ILmzXd8v1RJi3vfdb+V1PWtdMWaUMbeo6jR9uK+Cu81Nlbz71kart697Mn1JxIVr
-299tn7QxwBUZJTusIbKSiR0ECRwbESOvSYwnMjJqGQ5L7OjlP6IZUOYRGaTNZfp2
-VlHn3sBuFux6joSMyOYTvvn/QIn7/Dpnax/s7VdamkmcVxhqFUrfpogz/auNNvO+
-VtEpKP3+aUd0R750n8KS1xEIVAvHBJjLQ8iZwPsK7UQcYuiuwpAaZimLJYRd8zNY
-tlbwPx09Q6UV3stQHbcOgz/4ouoBKanfahPh6smHX8b0zmh4qJu8yI1tUgminDGf
-wAcCyApRChY++O8GbX6KJbBpwNOP1+JvWebF+MG9aFfe3lZZqBH8IG1mmWiHJpu0
-Fb9xYwYoMpLcCevhSMvWeQ6yU6vqKX269u6oohSRVRq8qVUyuWRQhz4GZsPU/XeR
-5XJNTij3+k6POQV7hgc7a4s7S0WRUgc1b/NCf6ykL2j47yJ4kjJ3gDnRXi6Cpy+P
-wuH2Rp7eb+AjA3FujJuE79X2woHqm2YhuAoQpQT3lRzvbhbPRyl8BbQYblAHMpwf
-smlh8qionFrBUg8m6Gjkjxe6hr8j8XpV0CSHxiI=
+BBTLptIYB84a4afx3PtMoCyFrqVAojAfBgNVHSMEGDAWgBSsh9yLPYrbiUh+bzsc
+xnCSCRdv+TAxBggrBgEFBQcBAQQlMCMwIQYIKwYBBQUHMAGGFWh0dHA6Ly8xMjcu
+MC4wLjE6ODg4ODAaBgNVHREEEzARgglsb2NhbGhvc3SHBH8AAAEwDQYJKoZIhvcN
+AQELBQADggIBABGLA6pQOFOIcWYBL9Wrgkm6TUVaILb3bh/Kd873k4XsTdq6F3Hc
+MHt/VTUHiKJKRwacjBugM19G3cnG9Q4nSG4fC6DoF+QWO9DjC1ZPXF+3rvvaRhML
+/Og9cn6rLRlNbAmLMlGaerhJcH7Oznh/lZw6jgXMKa8L3kK4zV5WqC946hln7adZ
+wM4KTFBGZ5pucmv9rgCmL5qTlzlYBrQFo3iptt9mIg2uW/3oN3glrC5aoGVWPoME
+v5iWMOER+do7apfEdyjW10YnpAVnLvW41C7HADlJCJunWCFITPuP3Zlp6lm8QZb9
+Gika/lMWaiusklEYrIXZfdV3rWBjmEcsUuyF763/sFjXEntvcCuTKpL4mTwVeibU
+eRYFk5r0Abzmm6Axw9cSI0cSgTACBgwTyjhMY5YtF0FTBovFo4zDlrfitYVJ981G
+ASH/T9FlvjcbhHx5puGoqNeMYzQ1RdVCEAMPYPpSxTkDJrFBbLlTPM+NXfoCrAp6
+BCco3zOyAWnYPnI4V2DTqEdfmFWMVRU2WG7H/GWl+Md/Gozet3khUJh2aYqzSLAd
+spH9JY+9WReBIrxnMtX75sPNPLN5b80cSrAEEzyvgFN88MYo8zc+Nk1l7zjcAF+I
+fgQ0dWb6umwfdrJVuyFg/rhI+KzLbhYvdYdE0MNt1Wrh5rkyfjmm5tB/
 -----END CERTIFICATE-----
diff --git a/test/org/apache/tomcat/util/net/localhost-crl-rsa-key.pem b/test/org/apache/tomcat/util/net/localhost-crl-rsa-key.pem
index 78b6d4c8a9..f8de8c251b 100644
--- a/test/org/apache/tomcat/util/net/localhost-crl-rsa-key.pem
+++ b/test/org/apache/tomcat/util/net/localhost-crl-rsa-key.pem
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCNrDDJ/Cr4ZuXo
-OncF8nYN1eOJu6bNNfUvgZYC43DY4ElLUuiCWJ0DDxDf8y7EHWcnjoXpRBeCj6sI
-oQHh09zpc3kSsLKko9vfWNJSewu5rJU8ZpSScIQ9NWOfhuasqpdZhphF1YTgJEE9
-Hb9Y38TSzfc/6DCX62qZI33d7agJoOK9lwPcjNH9XoNrLzfKyKeihCPcZeCVHQHR
-6eg1F+XQhGiVSDXYUbBXQiKrke3jV1BckEq2DqpS31QOokaldnEI7PtSpluDlks7
-CzKLMokbmr7HdIrNjCurhtGW7WZo+nOobF+j55pWf5xqChTnkpAbKS2ZTK17B/yZ
-aMoHdMANAgMBAAECggEARcbt3sX/CgpwKRGGpty1DXpvz9onPQJa6ROLpY+M+Jx7
-LQjAMNbhOmz0tECro3cR4/c7+FiLtcf6Bs16RlZZg3fWxYBW9GUqOZafPHWTIFei
-xzWE7p1RXG5Ly3ofaiK5WaRDon2YLOdeZHIe2PCZmfRM12KOcHzIK3XCHAjeDyM9
-e2T2nxalFz3ib1tGnUZFU3RXTmxiZo8p2gI5mY9L1+djJNcbLS4s0ZYMv9tJERs8
-Ee3Y00rj1Q0sJgBc8oIxDuy78e5EdpykN8XvzTNN8lBU5QejZ1uRFOrIMiYpY/Uk
-86Scrinc6kSjfeX0si5hvEbsx5RAnyHrZ+nRiJARxwKBgQDBZ72mUdtO0zRX/1dX
-rAV+HH+ttHBGZLBu/pa0BZ/Hvf/CL6/aGLZE9JOpNOTGUrRr2ngW3rvC0OG3wb3w
-RhYElaHbLUUCp7vrW9+eg5ZB/SqC/Qbf8gSahQh96N9NZ46+zjQ2f1DSAev+s1Qq
-kwrTfYnA4jsTo4mGpIcg0rayJwKBgQC7hjuAz3b586jHP0YCWpQkgmRC/se+Kh1Q
-5+Oxhzz5Fas83pSIFJGg8fvBVLMmplpWsW9o1LBlzBDhmIuhPO9vOKhNvWlSkgvp
-qENKkGMhR36vpMCE1R8e2GXyN3jlWKAggFE6W+AfpTnuN3+IKtw541/ZefzzeHwK
-oMSK9U5AqwKBgHfzJVYv0npy1zX0cXE4iTeL6UwMas3dyOcuEr2X917kYelHtiLn
-zLO7lJEO8wxlYuy5VF2qynyrHDLhgDGy5hj1zKqoyvI4oX35PxmKtvg6UdFnqIng
-Cibjdz7P3R6eqZOBRDTAhZmaA4m2Iu88vywn4fW02br2ZGcTR5N93D1lAoGAZcRN
-GnR8jt0qpSazaaeaac3Rd4IpCAx26GdP7BIGhu65hUkNtmPjPELWa2754mm48P9O
-BMgYCsaaCrPsYs5c6jEHNVkrhUH48Q79pcOB6JeSKuPwDqZSQz0Q5kgwddaI39qD
-OnaNxN63941qyozoAwpgA/ftzHuAZYwl3XuOwg0CgYEAr0zEBJeKkiJG7/jQEDwn
-Cg6W4K3+e22c3KA684Bixfx0vdJOfjBHe32W0d6Vs2/DvzH792NUirbEgrgxJ5sn
-M1c8b9os6aTytR34MpFzN6Kbeqo7RqYkPTA/4oYKtJEpP/ZZvynXkV1Iok8XsL8Z
-yMg3bhNxDZ6Cx5BroN+cbSs=
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCq8u4B3SH9S/Ye
+n6GmZUJxHNvP10dtIIFjAcdsolouFw1d2WB45dkqmsAtHC0knbP2JqmTgIatDrAG
+TmTcEdpwoOtHqp05PhActf68yrJbuD8MqNSzy57d9RkO3IM0VB0XuQ0uXUwx15tk
+6UCJ3nd1rW6GPkYViO1IiLuid6UFSjMzPrvLe/cAm+tOK/VKWQf/GFqhScIlSCED
+VWTa13UP6FWoYTnKrwlkwsFnS+yV32ZQLTlF1kyNB6g90fw8RnaSLxqwJ/AM6Bkr
+xrStYsTGIXwjF8QTpA590wU7C0OrQzKIEmeRGwHkmJD8Z4jXi45r8CpZYtHcJDgo
+jLfpG3snAgMBAAECggEAGwmoPlA454SjrU1HNneujhBn7dQZXne1LzEhVxvIkqCf
+wxe2C/kio3vtaFUcCL4OsCCGUqeR5X48tgqhJjOGrqis/d1M17hquPfKDhcrJZmb
+E0gCuFs8ydNRvsl+0QB6x31DyfEEs59r2waPaB7xGwIuyHnCAPbyvLWvo68zwQWs
+q3YF8Z03wPoSVxx9IrIsi01vaZGYREXmsNEX5krvd+Ku2JsQJ9NreduMg/gtegbB
+snN9MpjbydRWnwql4YzOCPaaGlQltrUFixKw6InZJRkKaSri49gEseaiSqwx31mY
+RvnWtyZfq1qRkcQm+NC9WO3cyCH38Um1egQmVpmguQKBgQDUlfAuAotMDN9aFnQ5
+DUviMyVy+ea1SDvJ3TnoaplZ4vp9pmwX5B2RPz8MzHKVLhll9h6GjAIXZuLT2Fed
+OyGUhM0Cd//+5esp0dHMKQFdzVMrhn8eGPPPBReEZtILbi3ulRJI6nsagAmKnLLN
+bik5fbcsc1KhtIUzGFbrw9ThWQKBgQDN3DTFrxP50XLc1hfs3OjP3OqZ7mqMyVXq
+JFJ4JNiFCFk/Jhqz83IuxrzoWGVmtnDjj9sdN/TsClG337xD9L3OgpS1yjjbzhi5
+wYG4cCjNxpqis097LFHqZDBBSZ9d3SWsdENqSWPbWOVLZQKrwR239m3mjCipSewI
+JRnX+1cwfwKBgQCrySoYFAg6gWBvrRtoCv2aIZiOi7DKJz/hRPsJfDLFtyySIszQ
+lY7rE3/AuOmS8XimszdBpJwACy0a4YUTUng1Swdbilr8wRDCb4Ioh65J/aTK1Fme
+ma1TShsR7ACqKfPGCwKGl6y44mRTdYLrjKyVf6horBxG/dhxTKbYyBwbqQKBgQDE
+vQPuPXFg2ivlI/L/muwg46eN704DONOUDpyGV+hZ022/rUHt4uaoD6UwhHJ8ZDWl
+NbGZzgWTpBUPHpMFexv/BcrrpdULNH9q36WCyCYm6vyUK7v1Ipky4gdADgVxpk0/
+8GkRZgw58E5K7MFNtiUZ0DieEis2BwC9k/+L65gbLwKBgG87Ag/C0un6LYMHI8gT
+DyqrsjARdlwVeyL864p3GHQbfGeQ2VTxSriEPHwSc2H1FtRsFo06P98DBjVW1xDD
+MPY8PD9MZ347rnNi1lcG42moxY6ywYesRwKaDPC98PgvaXzmm81wSyjOerwDQubi
+UQ6bYhVLe3BdVfFI8N8kSRzu
 -----END PRIVATE KEY-----
diff --git a/test/org/apache/tomcat/util/net/localhost-crl-rsa.jks b/test/org/apache/tomcat/util/net/localhost-crl-rsa.jks
index 1ea111cf5e..1519eab143 100644
Binary files a/test/org/apache/tomcat/util/net/localhost-crl-rsa.jks and b/test/org/apache/tomcat/util/net/localhost-crl-rsa.jks differ
diff --git a/test/org/apache/tomcat/util/net/localhost-ec-cert.pem b/test/org/apache/tomcat/util/net/localhost-ec-cert.pem
index 7d6e42fbbf..520b300a8b 100644
--- a/test/org/apache/tomcat/util/net/localhost-ec-cert.pem
+++ b/test/org/apache/tomcat/util/net/localhost-ec-cert.pem
@@ -5,18 +5,18 @@ Certificate:
         Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=US, ST=DE, L=Wilmington, O=The Apache Software Foundation, OU=Apache Tomcat PMC, CN=Apache Tomcat Test CA
         Validity
-            Not Before: Aug 12 13:19:18 2026 GMT
-            Not After : Aug 11 13:19:18 2028 GMT
+            Not Before: Dec  5 19:15:40 2025 GMT
+            Not After : Dec  5 19:15:40 2027 GMT
         Subject: C=US, ST=DE, L=Wilmington, O=The Apache Software Foundation, OU=Apache Tomcat PMC, CN=localhost
         Subject Public Key Info:
             Public Key Algorithm: id-ecPublicKey
                 Public-Key: (256 bit)
                 pub:
-                    04:de:8a:ce:bd:a3:3b:f6:0e:94:4b:3f:15:c3:cc:
-                    21:35:11:ba:73:14:4d:47:6a:f2:80:47:08:26:26:
-                    d3:21:c9:bf:7b:3a:bb:8a:3a:73:65:a4:bb:7d:11:
-                    7c:d2:0a:39:af:43:b0:f5:f2:87:18:78:59:32:e6:
-                    5c:84:f7:82:ba
+                    04:4a:67:a8:52:9a:a4:a8:54:e0:0a:26:01:7b:c8:
+                    20:fc:99:99:09:b9:ce:a4:11:bd:99:0f:9d:73:b3:
+                    82:ef:9f:a9:73:31:bf:e5:f2:10:b2:b4:91:82:e1:
+                    d5:9e:91:4b:e4:f2:ce:87:e1:a6:ee:6b:b5:68:39:
+                    c0:c0:9a:e7:5d
                 ASN1 OID: prime256v1
                 NIST CURVE: P-256
         X509v3 extensions:
@@ -25,67 +25,66 @@ Certificate:
             Netscape Comment: 
                 OpenSSL Generated Certificate
             X509v3 Subject Key Identifier: 
-                B5:3C:CB:63:F1:9E:E9:E9:51:2A:8F:D9:8C:59:EE:22:E3:25:92:4B
+                AD:35:5C:21:09:CA:97:51:8F:CC:F2:33:B0:86:80:DF:73:4F:FD:73
             X509v3 Authority Key Identifier: 
-                DB:76:66:26:98:CB:BF:69:31:99:2F:95:6C:9E:C2:59:3C:5D:4D:8C
+                AC:87:DC:8B:3D:8A:DB:89:48:7E:6F:3B:1C:C6:70:92:09:17:6F:F9
             Authority Information Access: 
                 OCSP - URI:http://127.0.0.1:8888
-                OCSP - URI:http://127.0.0.1:8889
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        5a:f0:33:98:8c:e5:4c:d8:a8:48:19:46:4c:b4:89:4d:80:38:
-        55:82:14:69:e8:45:33:65:14:1c:74:9a:2e:de:e7:99:9f:86:
-        32:ea:5c:a9:38:87:9a:91:e0:7b:4e:32:36:b5:06:98:55:f1:
-        97:29:3a:c9:b3:ca:c5:ec:a4:03:c3:a1:91:47:dd:a5:6d:0d:
-        01:79:e3:8a:21:cd:7d:1f:80:2e:b6:6a:cc:05:df:34:d0:82:
-        9e:93:31:06:86:2d:ad:b3:f0:db:93:d7:46:9e:8b:64:d3:cc:
-        6f:94:34:0f:6f:ee:1a:3c:09:b6:d7:1d:76:7b:db:c8:c7:7b:
-        18:c1:a1:44:b6:47:4f:8b:85:95:75:3c:9d:ea:84:ed:a6:2b:
-        cb:c7:59:b6:84:a7:94:b2:3a:58:3c:a6:8f:b4:04:48:5a:a5:
-        d5:d6:54:cf:72:e8:13:0b:2a:10:ee:e1:b3:77:89:0e:bf:8d:
-        b0:78:2c:56:51:d5:2c:98:52:bc:dd:b7:92:de:a7:f2:64:b6:
-        5f:c8:88:d2:b4:c2:29:0c:30:ce:04:85:55:f9:cc:6a:f3:cf:
-        7e:5d:48:69:8c:d0:41:8d:37:90:87:33:cd:27:d7:aa:c6:ac:
-        4c:c9:b5:82:6f:9b:6a:5e:6a:02:22:50:fe:01:7b:34:8d:b8:
-        2b:23:66:0c:e7:02:dc:1a:09:14:49:73:22:4f:2b:b1:29:b3:
-        cb:71:c2:a7:f0:dd:f3:d9:99:84:82:ff:35:87:fe:73:de:37:
-        fc:a8:07:6a:03:51:f8:35:ed:5d:f1:12:56:33:87:5c:97:ef:
-        40:51:f6:ea:cd:c4:70:fc:bc:5e:47:b4:1c:df:86:b1:e3:de:
-        fc:c3:9a:95:fb:7e:09:ed:bf:2f:6f:b1:6e:ab:da:5a:41:98:
-        8b:14:0b:28:ed:7d:59:dc:4d:b0:a1:26:55:29:db:55:a9:25:
-        ee:ef:cd:9f:b0:67:8e:89:9b:7b:ea:f6:aa:15:6d:3e:8c:b6:
-        1c:60:35:2f:2c:89:23:ac:66:5f:69:44:53:ac:35:67:ce:56:
-        65:71:66:3f:0b:d6:ee:87:6d:e1:42:b9:19:3d:8e:b7:a9:cf:
-        44:62:30:49:21:1b:5e:13:2b:ec:5e:a1:d5:75:b1:16:19:ff:
-        28:11:c6:8e:33:c8:ae:14:c7:e8:d8:52:e9:fc:2a:0c:ff:26:
-        48:61:19:52:f2:b1:2d:22:db:2b:80:2c:30:b6:a7:2d:aa:10:
-        de:37:43:a1:02:e9:8a:c9:38:3f:16:5f:d8:fa:3b:d7:40:11:
-        34:61:27:ab:4e:b6:2c:03:ba:63:01:b7:92:08:b9:b8:0a:bb:
-        ce:5a:a4:2a:5e:30:8d:73
+        9a:74:81:f5:9d:87:bc:47:ea:33:a9:ef:d4:6b:6a:de:77:4e:
+        fc:41:c4:44:e7:ca:02:63:8b:a6:4f:b3:ed:14:44:8d:3f:29:
+        3b:ee:2f:30:2b:31:bc:2f:88:64:ce:e7:4e:77:d7:d2:94:c6:
+        31:98:ea:b8:c3:0c:23:e9:cd:00:99:2f:bd:41:bb:49:5d:ae:
+        f0:65:c7:b8:1b:c3:07:58:ea:ed:0e:ff:22:be:7b:0a:77:15:
+        62:49:e0:7c:39:6a:9d:02:7d:b3:6d:94:eb:14:e6:75:1f:8a:
+        40:cd:88:13:bd:42:03:49:18:ae:11:43:d5:f1:98:c5:a0:87:
+        18:33:ae:84:c6:65:8f:61:89:be:54:d9:52:02:80:59:30:42:
+        df:02:d0:e5:44:9c:f5:36:28:3b:26:5c:a3:28:89:d2:b9:a3:
+        c7:2a:99:d3:86:b5:fd:13:6d:d7:f9:5d:7e:88:35:af:19:9e:
+        4e:9c:8b:48:92:15:62:47:c7:c4:1e:25:4e:d5:8b:96:1f:7e:
+        cc:55:10:5f:82:1e:3f:b7:c7:ba:00:38:59:55:53:59:3c:f9:
+        0b:2a:ab:d4:bf:0e:84:2b:71:61:be:14:4d:12:c1:8d:ab:8b:
+        14:d7:af:b2:b4:6a:7e:b6:23:64:a2:7b:11:6b:ec:6b:1a:64:
+        ea:49:f0:a7:9f:d0:c9:47:71:fa:01:8a:3b:be:b9:6d:4a:d9:
+        58:25:1a:a8:f6:88:35:e5:d4:98:53:48:62:f9:24:db:87:21:
+        bb:67:5f:b7:d1:60:0f:34:f5:63:f9:52:fd:f1:33:cb:5f:79:
+        16:c8:e5:e4:c1:79:0c:d9:76:b4:44:56:ff:e7:86:a5:9f:dd:
+        72:c6:15:4f:ed:6e:2d:1a:54:61:b3:5c:c7:26:10:98:9f:7e:
+        77:0b:80:4c:a9:d7:bd:28:4c:3c:3b:05:67:e1:af:6d:1b:26:
+        d5:24:96:5f:01:69:84:37:1e:f2:30:3e:9d:e9:8a:fd:0f:28:
+        56:87:d1:28:8f:32:5d:c9:96:f0:ec:14:b1:34:b9:0d:63:16:
+        1b:26:e5:76:33:12:fe:52:f5:49:17:2d:14:06:fc:3f:4e:81:
+        b2:02:7d:e7:16:ae:62:d2:0f:1c:df:a1:50:a3:ff:3e:69:d5:
+        7f:e7:c4:e7:6a:b8:93:b2:d8:99:9b:72:30:e9:e0:62:d6:c3:
+        c1:39:a0:1b:30:37:63:6e:b0:0f:47:20:71:8a:20:56:2f:2d:
+        a6:54:35:ee:72:38:fc:e2:bb:67:60:4f:f7:b8:79:cb:57:6e:
+        f3:7c:b3:55:03:01:41:29:48:ca:f6:a9:3a:4a:6a:26:cb:f7:
+        21:54:fa:70:31:3d:95:d0
 -----BEGIN CERTIFICATE-----
-MIIEojCCAoqgAwIBAgICEAQwDQYJKoZIhvcNAQELBQAwgZQxCzAJBgNVBAYTAlVT
+MIIEfzCCAmegAwIBAgICEAQwDQYJKoZIhvcNAQELBQAwgZQxCzAJBgNVBAYTAlVT
 MQswCQYDVQQIEwJERTETMBEGA1UEBxMKV2lsbWluZ3RvbjEnMCUGA1UEChMeVGhl
 IEFwYWNoZSBTb2Z0d2FyZSBGb3VuZGF0aW9uMRowGAYDVQQLExFBcGFjaGUgVG9t
-Y2F0IFBNQzEeMBwGA1UEAxMVQXBhY2hlIFRvbWNhdCBUZXN0IENBMB4XDTI2MDgx
-MjEzMTkxOFoXDTI4MDgxMTEzMTkxOFowgYgxCzAJBgNVBAYTAlVTMQswCQYDVQQI
+Y2F0IFBNQzEeMBwGA1UEAxMVQXBhY2hlIFRvbWNhdCBUZXN0IENBMB4XDTI1MTIw
+NTE5MTU0MFoXDTI3MTIwNTE5MTU0MFowgYgxCzAJBgNVBAYTAlVTMQswCQYDVQQI
 DAJERTETMBEGA1UEBwwKV2lsbWluZ3RvbjEnMCUGA1UECgweVGhlIEFwYWNoZSBT
 b2Z0d2FyZSBGb3VuZGF0aW9uMRowGAYDVQQLDBFBcGFjaGUgVG9tY2F0IFBNQzES
-MBAGA1UEAwwJbG9jYWxob3N0MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE3orO
-vaM79g6USz8Vw8whNRG6cxRNR2rygEcIJibTIcm/ezq7ijpzZaS7fRF80go5r0Ow
-9fKHGHhZMuZchPeCuqOB0jCBzzAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1P
-cGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUtTzLY/Ge6elR
-Ko/ZjFnuIuMlkkswHwYDVR0jBBgwFoAU23ZmJpjLv2kxmS+VbJ7CWTxdTYwwVAYI
-KwYBBQUHAQEESDBGMCEGCCsGAQUFBzABhhVodHRwOi8vMTI3LjAuMC4xOjg4ODgw
-IQYIKwYBBQUHMAGGFWh0dHA6Ly8xMjcuMC4wLjE6ODg4OTANBgkqhkiG9w0BAQsF
-AAOCAgEAWvAzmIzlTNioSBlGTLSJTYA4VYIUaehFM2UUHHSaLt7nmZ+GMupcqTiH
-mpHge04yNrUGmFXxlyk6ybPKxeykA8OhkUfdpW0NAXnjiiHNfR+ALrZqzAXfNNCC
-npMxBoYtrbPw25PXRp6LZNPMb5Q0D2/uGjwJttcddnvbyMd7GMGhRLZHT4uFlXU8
-neqE7aYry8dZtoSnlLI6WDymj7QESFql1dZUz3LoEwsqEO7hs3eJDr+NsHgsVlHV
-LJhSvN23kt6n8mS2X8iI0rTCKQwwzgSFVfnMavPPfl1IaYzQQY03kIczzSfXqsas
-TMm1gm+bal5qAiJQ/gF7NI24KyNmDOcC3BoJFElzIk8rsSmzy3HCp/Dd89mZhIL/
-NYf+c943/KgHagNR+DXtXfESVjOHXJfvQFH26s3EcPy8Xke0HN+GsePe/MOalft+
-Ce2/L2+xbqvaWkGYixQLKO19WdxNsKEmVSnbVakl7u/Nn7Bnjombe+r2qhVtPoy2
-HGA1LyyJI6xmX2lEU6w1Z85WZXFmPwvW7odt4UK5GT2Ot6nPRGIwSSEbXhMr7F6h
-1XWxFhn/KBHGjjPIrhTH6NhS6fwqDP8mSGEZUvKxLSLbK4AsMLanLaoQ3jdDoQLp
-isk4PxZf2Po710ARNGEnq062LAO6YwG3kgi5uAq7zlqkKl4wjXM=
+MBAGA1UEAwwJbG9jYWxob3N0MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAESmeo
+UpqkqFTgCiYBe8gg/JmZCbnOpBG9mQ+dc7OC75+pczG/5fIQsrSRguHVnpFL5PLO
+h+Gm7mu1aDnAwJrnXaOBrzCBrDAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1P
+cGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUrTVcIQnKl1GP
+zPIzsIaA33NP/XMwHwYDVR0jBBgwFoAUrIfciz2K24lIfm87HMZwkgkXb/kwMQYI
+KwYBBQUHAQEEJTAjMCEGCCsGAQUFBzABhhVodHRwOi8vMTI3LjAuMC4xOjg4ODgw
+DQYJKoZIhvcNAQELBQADggIBAJp0gfWdh7xH6jOp79Rrat53TvxBxETnygJji6ZP
+s+0URI0/KTvuLzArMbwviGTO505319KUxjGY6rjDDCPpzQCZL71Bu0ldrvBlx7gb
+wwdY6u0O/yK+ewp3FWJJ4Hw5ap0CfbNtlOsU5nUfikDNiBO9QgNJGK4RQ9XxmMWg
+hxgzroTGZY9hib5U2VICgFkwQt8C0OVEnPU2KDsmXKMoidK5o8cqmdOGtf0Tbdf5
+XX6INa8Znk6ci0iSFWJHx8QeJU7Vi5YffsxVEF+CHj+3x7oAOFlVU1k8+Qsqq9S/
+DoQrcWG+FE0SwY2rixTXr7K0an62I2SiexFr7GsaZOpJ8Kef0MlHcfoBiju+uW1K
+2VglGqj2iDXl1JhTSGL5JNuHIbtnX7fRYA809WP5Uv3xM8tfeRbI5eTBeQzZdrRE
+Vv/nhqWf3XLGFU/tbi0aVGGzXMcmEJiffncLgEyp170oTDw7BWfhr20bJtUkll8B
+aYQ3HvIwPp3piv0PKFaH0SiPMl3JlvDsFLE0uQ1jFhsm5XYzEv5S9UkXLRQG/D9O
+gbICfecWrmLSDxzfoVCj/z5p1X/nxOdquJOy2JmbcjDp4GLWw8E5oBswN2NusA9H
+IHGKIFYvLaZUNe5yOPziu2dgT/e4ectXbvN8s1UDAUEpSMr2qTpKaibL9yFU+nAx
+PZXQ
 -----END CERTIFICATE-----
diff --git a/test/org/apache/tomcat/util/net/localhost-ec-key.pem b/test/org/apache/tomcat/util/net/localhost-ec-key.pem
index e094beaa6b..e6621274ca 100644
--- a/test/org/apache/tomcat/util/net/localhost-ec-key.pem
+++ b/test/org/apache/tomcat/util/net/localhost-ec-key.pem
@@ -1,5 +1,8 @@
------BEGIN PRIVATE KEY-----
-MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgfO5qPdjiUHH9vG65
-T/O8y8tRSG+aF+DBOR+EIvtHyHChRANCAATeis69ozv2DpRLPxXDzCE1EbpzFE1H
-avKARwgmJtMhyb97OruKOnNlpLt9EXzSCjmvQ7D18ocYeFky5lyE94K6
------END PRIVATE KEY-----
+-----BEGIN EC PARAMETERS-----
+BggqhkjOPQMBBw==
+-----END EC PARAMETERS-----
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIF9PqIbcIMlMOKkaAID2L1ULbJApzzOj3WlBYuyZQqaaoAoGCCqGSM49
+AwEHoUQDQgAESmeoUpqkqFTgCiYBe8gg/JmZCbnOpBG9mQ+dc7OC75+pczG/5fIQ
+srSRguHVnpFL5PLOh+Gm7mu1aDnAwJrnXQ==
+-----END EC PRIVATE KEY-----
diff --git a/test/org/apache/tomcat/util/net/localhost-ec.jks b/test/org/apache/tomcat/util/net/localhost-ec.jks
index ed7c49aa2a..e510be8894 100644
Binary files a/test/org/apache/tomcat/util/net/localhost-ec.jks and b/test/org/apache/tomcat/util/net/localhost-ec.jks differ
diff --git a/test/org/apache/tomcat/util/net/localhost-rsa-cert.pem b/test/org/apache/tomcat/util/net/localhost-rsa-cert.pem
index cefcf73c67..9d016d3b17 100644
--- a/test/org/apache/tomcat/util/net/localhost-rsa-cert.pem
+++ b/test/org/apache/tomcat/util/net/localhost-rsa-cert.pem
@@ -5,31 +5,31 @@ Certificate:
         Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=US, ST=DE, L=Wilmington, O=The Apache Software Foundation, OU=Apache Tomcat PMC, CN=Apache Tomcat Test CA
         Validity
-            Not Before: Aug 12 13:19:18 2026 GMT
-            Not After : Aug 11 13:19:18 2028 GMT
+            Not Before: Dec  5 19:13:23 2025 GMT
+            Not After : Dec  5 19:13:23 2027 GMT
         Subject: C=US, ST=DE, L=Wilmington, O=The Apache Software Foundation, OU=Apache Tomcat PMC, CN=localhost
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
                 Public-Key: (2048 bit)
                 Modulus:
-                    00:88:68:46:8f:15:91:67:ed:70:cf:d3:bf:15:72:
-                    94:24:4f:61:b5:cd:84:16:e9:7a:52:8a:57:6f:3d:
-                    a4:e4:8b:36:20:ef:d0:54:ee:97:6d:62:51:a6:a1:
-                    18:7c:02:1f:9d:c7:16:4a:83:70:85:5e:5b:38:c3:
-                    c9:05:98:06:da:c9:0d:58:5e:37:68:6d:cf:23:7b:
-                    7e:3e:99:25:6e:5a:7a:56:c2:49:79:67:39:67:5e:
-                    13:63:e8:f8:f7:95:bc:81:44:93:0c:ef:1c:f4:57:
-                    78:ca:52:50:1c:08:d5:11:bc:19:9d:0b:9f:e1:f2:
-                    a8:1a:00:58:93:13:b6:5d:8c:bf:e1:47:64:73:a4:
-                    d3:a4:37:6e:3c:01:c9:06:c8:17:35:e9:c0:14:ed:
-                    43:a1:ad:54:8f:54:8c:19:c2:9c:b9:82:47:10:50:
-                    eb:40:f4:f9:ee:10:be:89:bc:41:60:d5:9e:2a:41:
-                    99:e7:1a:ef:a6:93:2a:67:79:44:be:d1:8f:84:95:
-                    4a:fb:3a:83:16:cb:32:8b:2a:32:a6:00:b1:60:ba:
-                    4e:3b:96:bb:2e:57:36:d5:dc:56:79:82:b8:b4:29:
-                    74:38:5c:fd:07:b1:44:bf:84:fa:a5:52:ef:d8:be:
-                    e0:29:5d:34:3e:e3:94:47:60:cc:ad:f8:c1:4c:d5:
-                    8a:d3
+                    00:b1:da:2e:50:5c:5b:22:db:84:61:5e:e4:9d:e1:
+                    a4:24:6c:92:d3:96:5a:77:52:c8:f7:cf:16:b5:60:
+                    80:a7:15:0e:12:75:1a:bc:3f:0b:54:38:96:f6:2f:
+                    0a:38:6c:21:68:da:13:49:a2:7b:7c:80:c7:aa:69:
+                    fe:e3:8c:b1:ce:73:e6:5b:80:e2:36:89:49:5b:03:
+                    ce:76:47:bf:35:20:ee:c6:78:df:62:aa:d1:d7:bf:
+                    91:b0:fc:aa:fd:7f:59:3f:8a:51:9f:7d:59:0f:e1:
+                    d6:dc:7b:16:80:62:3f:6c:c2:2c:1b:a5:05:1e:40:
+                    90:60:20:e1:c3:6d:3f:ff:1c:73:84:92:86:59:03:
+                    e5:4a:f6:d6:dc:e6:6e:68:1f:05:5f:f7:21:a9:fc:
+                    5e:e6:fc:8b:c7:36:34:18:fc:d5:70:21:54:5a:f1:
+                    10:c9:24:c8:08:92:2c:91:13:54:b1:d9:59:70:80:
+                    39:9f:8c:90:ad:c9:d2:b8:bd:a3:28:20:3f:67:35:
+                    a2:d9:20:e2:3f:2e:be:3d:88:d2:3b:7d:3b:47:44:
+                    79:53:e2:52:98:72:13:ae:a2:9d:fe:68:bd:36:8c:
+                    2e:43:b1:3b:cd:50:35:3d:b5:f7:2f:43:ea:1e:c9:
+                    d1:10:ac:e8:24:c1:8c:ee:e6:d0:c2:06:de:14:2d:
+                    1a:89
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Basic Constraints: 
@@ -37,74 +37,72 @@ Certificate:
             Netscape Comment: 
                 OpenSSL Generated Certificate
             X509v3 Subject Key Identifier: 
-                E4:F4:0A:41:04:5D:2C:42:D7:7D:EE:2A:80:46:8E:0E:B2:62:E6:4A
+                70:34:99:AD:29:E3:27:9D:BD:97:72:50:20:98:D2:97:B3:6C:AD:A1
             X509v3 Authority Key Identifier: 
-                DB:76:66:26:98:CB:BF:69:31:99:2F:95:6C:9E:C2:59:3C:5D:4D:8C
+                AC:87:DC:8B:3D:8A:DB:89:48:7E:6F:3B:1C:C6:70:92:09:17:6F:F9
             Authority Information Access: 
                 OCSP - URI:http://127.0.0.1:8888
-                OCSP - URI:http://127.0.0.1:8889
             X509v3 Subject Alternative Name: 
                 DNS:localhost, IP Address:127.0.0.1
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        2f:cb:26:1b:36:ba:1a:00:2f:d3:a9:71:61:03:7a:e7:8e:6e:
-        4f:5f:57:c9:94:b5:da:ea:da:bf:9c:10:23:e3:cb:94:48:c0:
-        4f:f8:5f:6d:b1:8e:b6:17:89:b2:1a:14:99:e2:ca:16:a0:e2:
-        a5:6f:ad:44:b0:ed:76:56:02:76:2e:21:a6:58:ed:af:72:f9:
-        c5:70:75:aa:77:e6:c5:33:9f:8c:c4:f3:c6:42:e2:62:d2:fe:
-        7e:4c:18:da:b2:ff:81:33:54:11:e9:be:d7:12:5e:21:fe:fc:
-        5a:66:f3:4e:4d:1c:23:a1:28:20:f8:bc:47:34:f4:ff:0e:fc:
-        b0:91:f7:b3:88:f5:1d:09:e7:7c:0e:80:e6:13:1a:27:89:48:
-        6a:aa:3f:7d:1b:22:23:5f:22:f5:75:67:13:a4:7e:b3:48:73:
-        cd:56:b1:41:5a:d3:24:cc:41:c2:f5:a1:25:10:bb:ee:10:c4:
-        0a:bc:2d:3a:0d:99:ab:65:63:02:c5:46:59:c1:16:6b:21:ef:
-        bc:f0:3c:43:76:66:34:2b:03:ea:9d:be:f5:59:c3:a4:b8:4a:
-        77:f5:0d:7e:5e:f6:e9:8f:2d:e7:bd:c1:7d:66:be:4d:7f:b0:
-        1e:9d:15:90:d1:1a:99:ad:0f:3e:be:16:6e:c8:ad:1b:dd:ac:
-        64:94:0f:f5:8e:4e:3b:d2:36:58:7e:ab:7b:4d:20:bd:70:a2:
-        71:d5:c5:1f:e6:5a:ed:77:f3:5c:e0:c2:cc:7c:40:60:c5:34:
-        fa:7c:01:73:5c:d7:6b:40:1b:2f:3a:b6:68:8e:6f:ca:1f:de:
-        4f:69:cb:41:21:18:42:10:d5:f8:3a:d8:44:62:26:3c:44:4f:
-        01:3c:d1:ad:28:13:1b:39:f2:e9:a0:44:eb:6b:f9:f6:17:68:
-        92:58:98:e7:4c:f5:9d:2a:86:f9:d5:c2:91:94:8f:99:d7:83:
-        98:f3:94:3d:d8:25:65:40:59:29:38:77:e6:a0:f8:90:4f:25:
-        46:aa:10:12:63:5a:61:7e:fa:8c:1b:d6:0f:5f:14:14:8f:22:
-        99:89:82:ac:d4:d7:cf:46:03:cb:9d:22:1b:1a:dd:11:20:0d:
-        98:ba:62:fa:f1:5d:fb:7c:aa:51:5a:f5:eb:76:9b:de:26:93:
-        1d:61:78:75:f4:6e:3d:80:c2:26:b7:1c:64:6f:71:d5:a2:89:
-        fb:91:6a:92:af:92:24:7b:ad:e6:35:45:3e:5d:cf:19:dc:20:
-        a3:0a:eb:fd:32:70:ff:c2:76:23:78:6e:2d:2d:06:51:cf:bf:
-        7c:ac:93:22:bd:9f:3e:f1:9d:99:7a:fd:44:0e:82:33:7c:9f:
-        b0:c7:0f:77:0b:6a:3d:e6
+        77:af:4a:b3:09:d8:9b:43:5a:73:78:10:ba:31:ad:a5:06:50:
+        49:5d:14:f7:7b:1c:38:f0:3a:9b:67:b3:cb:71:52:7a:df:67:
+        fa:e1:c1:8b:18:dc:4e:bf:21:6d:58:b1:5f:df:2d:f1:ee:62:
+        a1:b6:78:dd:e2:c5:f2:4f:0b:9d:3d:cc:88:c7:26:8d:f0:41:
+        02:ad:bd:e0:29:21:f9:0c:0a:07:cf:38:a4:f1:db:87:f7:e5:
+        ed:55:59:b5:34:7d:b4:39:70:ca:81:7a:bb:20:fa:2e:85:47:
+        72:9c:35:f8:f2:e1:57:f9:9e:5c:9c:76:92:50:6a:c9:52:e9:
+        a0:d3:4d:41:03:f7:4f:bb:fc:5c:b8:aa:2c:7d:10:ff:3f:6c:
+        82:e0:60:b8:d5:58:66:de:e0:db:30:b7:bf:3c:09:b9:3c:5c:
+        36:cc:c6:d3:aa:58:9f:90:fe:e7:eb:5b:62:e2:66:a5:88:ec:
+        dd:2b:64:d1:25:08:e6:0a:49:91:5f:ac:1f:35:8d:2c:a2:71:
+        de:01:18:b0:0e:13:3d:cd:83:92:67:62:63:8a:63:bb:eb:8d:
+        f9:b7:95:b0:b6:a8:9c:14:8c:0b:00:34:8b:65:af:b7:6c:b9:
+        1b:94:e2:54:3f:ee:87:0f:81:a9:3f:61:10:5f:ee:4d:42:b5:
+        67:77:30:2e:04:4f:ad:5d:4e:de:e3:20:b3:8f:ca:46:98:7d:
+        97:91:1d:4c:04:d9:bb:ae:02:3d:6f:55:dd:39:64:f3:53:86:
+        b6:4a:6a:eb:4a:7a:46:4e:0f:3b:44:8e:c2:46:c6:4b:07:1e:
+        b1:4e:8a:1c:fd:6a:06:55:2e:88:c6:85:8c:9b:c2:ea:90:e1:
+        0b:d9:b1:af:2d:80:7f:b6:a2:c7:7a:63:7d:0a:cd:60:f6:46:
+        ea:40:3d:7d:4e:89:3e:0b:5d:22:8f:b7:3a:3a:38:18:26:a3:
+        76:e9:cf:18:bc:c1:3c:8b:06:74:b6:f2:a8:a9:b4:cf:e1:96:
+        54:bd:87:21:1d:20:b6:25:d1:d9:c6:fa:94:25:c6:6e:2b:1e:
+        a1:51:e3:31:ff:43:77:bd:e0:4c:6a:c2:24:97:43:99:f6:cb:
+        dd:3f:63:31:88:af:07:ef:e0:2b:3b:8e:3b:80:26:27:a6:c3:
+        58:95:53:fa:39:14:59:42:3d:3a:e5:02:ff:0d:5b:e0:63:ad:
+        93:72:8e:1d:55:c2:f9:49:7d:5c:cb:35:d2:11:b4:86:2d:26:
+        61:74:1e:4d:e6:c7:97:e7:99:8b:fc:91:41:c8:9f:b8:ec:3e:
+        a3:f9:18:b5:2a:2e:1d:ee:2d:b6:cd:8f:14:be:b8:1c:6d:fd:
+        c3:59:61:66:87:e8:31:82
 -----BEGIN CERTIFICATE-----
-MIIFiTCCA3GgAwIBAgICEAAwDQYJKoZIhvcNAQELBQAwgZQxCzAJBgNVBAYTAlVT
+MIIFZjCCA06gAwIBAgICEAAwDQYJKoZIhvcNAQELBQAwgZQxCzAJBgNVBAYTAlVT
 MQswCQYDVQQIEwJERTETMBEGA1UEBxMKV2lsbWluZ3RvbjEnMCUGA1UEChMeVGhl
 IEFwYWNoZSBTb2Z0d2FyZSBGb3VuZGF0aW9uMRowGAYDVQQLExFBcGFjaGUgVG9t
-Y2F0IFBNQzEeMBwGA1UEAxMVQXBhY2hlIFRvbWNhdCBUZXN0IENBMB4XDTI2MDgx
-MjEzMTkxOFoXDTI4MDgxMTEzMTkxOFowgYgxCzAJBgNVBAYTAlVTMQswCQYDVQQI
+Y2F0IFBNQzEeMBwGA1UEAxMVQXBhY2hlIFRvbWNhdCBUZXN0IENBMB4XDTI1MTIw
+NTE5MTMyM1oXDTI3MTIwNTE5MTMyM1owgYgxCzAJBgNVBAYTAlVTMQswCQYDVQQI
 EwJERTETMBEGA1UEBxMKV2lsbWluZ3RvbjEnMCUGA1UEChMeVGhlIEFwYWNoZSBT
 b2Z0d2FyZSBGb3VuZGF0aW9uMRowGAYDVQQLExFBcGFjaGUgVG9tY2F0IFBNQzES
 MBAGA1UEAxMJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAiGhGjxWRZ+1wz9O/FXKUJE9htc2EFul6UopXbz2k5Is2IO/QVO6XbWJRpqEY
-fAIfnccWSoNwhV5bOMPJBZgG2skNWF43aG3PI3t+Ppklblp6VsJJeWc5Z14TY+j4
-95W8gUSTDO8c9Fd4ylJQHAjVEbwZnQuf4fKoGgBYkxO2XYy/4Udkc6TTpDduPAHJ
-BsgXNenAFO1Doa1Uj1SMGcKcuYJHEFDrQPT57hC+ibxBYNWeKkGZ5xrvppMqZ3lE
-vtGPhJVK+zqDFssyiyoypgCxYLpOO5a7Llc21dxWeYK4tCl0OFz9B7FEv4T6pVLv
-2L7gKV00PuOUR2DMrfjBTNWK0wIDAQABo4HuMIHrMAkGA1UdEwQCMAAwLAYJYIZI
+AQEAsdouUFxbItuEYV7kneGkJGyS05Zad1LI988WtWCApxUOEnUavD8LVDiW9i8K
+OGwhaNoTSaJ7fIDHqmn+44yxznPmW4DiNolJWwPOdke/NSDuxnjfYqrR17+RsPyq
+/X9ZP4pRn31ZD+HW3HsWgGI/bMIsG6UFHkCQYCDhw20//xxzhJKGWQPlSvbW3OZu
+aB8FX/chqfxe5vyLxzY0GPzVcCFUWvEQySTICJIskRNUsdlZcIA5n4yQrcnSuL2j
+KCA/ZzWi2SDiPy6+PYjSO307R0R5U+JSmHITrqKd/mi9NowuQ7E7zVA1PbX3L0Pq
+HsnREKzoJMGM7ubQwgbeFC0aiQIDAQABo4HLMIHIMAkGA1UdEwQCMAAwLAYJYIZI
 AYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQW
-BBTk9ApBBF0sQtd97iqARo4OsmLmSjAfBgNVHSMEGDAWgBTbdmYmmMu/aTGZL5Vs
-nsJZPF1NjDBUBggrBgEFBQcBAQRIMEYwIQYIKwYBBQUHMAGGFWh0dHA6Ly8xMjcu
-MC4wLjE6ODg4ODAhBggrBgEFBQcwAYYVaHR0cDovLzEyNy4wLjAuMTo4ODg5MBoG
-A1UdEQQTMBGCCWxvY2FsaG9zdIcEfwAAATANBgkqhkiG9w0BAQsFAAOCAgEAL8sm
-Gza6GgAv06lxYQN6545uT19XyZS12urav5wQI+PLlEjAT/hfbbGOtheJshoUmeLK
-FqDipW+tRLDtdlYCdi4hpljtr3L5xXB1qnfmxTOfjMTzxkLiYtL+fkwY2rL/gTNU
-Eem+1xJeIf78WmbzTk0cI6EoIPi8RzT0/w78sJH3s4j1HQnnfA6A5hMaJ4lIaqo/
-fRsiI18i9XVnE6R+s0hzzVaxQVrTJMxBwvWhJRC77hDECrwtOg2Zq2VjAsVGWcEW
-ayHvvPA8Q3ZmNCsD6p2+9VnDpLhKd/UNfl726Y8t573BfWa+TX+wHp0VkNEama0P
-Pr4WbsitG92sZJQP9Y5OO9I2WH6re00gvXCicdXFH+Za7XfzXODCzHxAYMU0+nwB
-c1zXa0AbLzq2aI5vyh/eT2nLQSEYQhDV+DrYRGImPERPATzRrSgTGzny6aBE62v5
-9hdokliY50z1nSqG+dXCkZSPmdeDmPOUPdglZUBZKTh35qD4kE8lRqoQEmNaYX76
-jBvWD18UFI8imYmCrNTXz0YDy50iGxrdESANmLpi+vFd+3yqUVr163ab3iaTHWF4
-dfRuPYDCJrccZG9x1aKJ+5Fqkq+SJHut5jVFPl3PGdwgowrr/TJw/8J2I3huLS0G
-Uc+/fKyTIr2fPvGdmXr9RA6CM3yfsMcPdwtqPeY=
+BBRwNJmtKeMnnb2XclAgmNKXs2ytoTAfBgNVHSMEGDAWgBSsh9yLPYrbiUh+bzsc
+xnCSCRdv+TAxBggrBgEFBQcBAQQlMCMwIQYIKwYBBQUHMAGGFWh0dHA6Ly8xMjcu
+MC4wLjE6ODg4ODAaBgNVHREEEzARgglsb2NhbGhvc3SHBH8AAAEwDQYJKoZIhvcN
+AQELBQADggIBAHevSrMJ2JtDWnN4ELoxraUGUEldFPd7HDjwOptns8txUnrfZ/rh
+wYsY3E6/IW1YsV/fLfHuYqG2eN3ixfJPC509zIjHJo3wQQKtveApIfkMCgfPOKTx
+24f35e1VWbU0fbQ5cMqBersg+i6FR3KcNfjy4Vf5nlycdpJQaslS6aDTTUED90+7
+/Fy4qix9EP8/bILgYLjVWGbe4Nswt788Cbk8XDbMxtOqWJ+Q/ufrW2LiZqWI7N0r
+ZNElCOYKSZFfrB81jSyicd4BGLAOEz3Ng5JnYmOKY7vrjfm3lbC2qJwUjAsANItl
+r7dsuRuU4lQ/7ocPgak/YRBf7k1CtWd3MC4ET61dTt7jILOPykaYfZeRHUwE2buu
+Aj1vVd05ZPNThrZKautKekZODztEjsJGxksHHrFOihz9agZVLojGhYybwuqQ4QvZ
+sa8tgH+2osd6Y30KzWD2RupAPX1OiT4LXSKPtzo6OBgmo3bpzxi8wTyLBnS28qip
+tM/hllS9hyEdILYl0dnG+pQlxm4rHqFR4zH/Q3e94ExqwiSXQ5n2y90/YzGIrwfv
+4Cs7jjuAJiemw1iVU/o5FFlCPTrlAv8NW+BjrZNyjh1VwvlJfVzLNdIRtIYtJmF0
+Hk3mx5fnmYv8kUHIn7jsPqP5GLUqLh3uLbbNjxS+uBxt/cNZYWaH6DGC
 -----END CERTIFICATE-----
diff --git a/test/org/apache/tomcat/util/net/localhost-rsa-copy1.jks b/test/org/apache/tomcat/util/net/localhost-rsa-copy1.jks
index 5be60d3afb..7422fd6f20 100644
Binary files a/test/org/apache/tomcat/util/net/localhost-rsa-copy1.jks and b/test/org/apache/tomcat/util/net/localhost-rsa-copy1.jks differ
diff --git a/test/org/apache/tomcat/util/net/localhost-rsa-key.pem b/test/org/apache/tomcat/util/net/localhost-rsa-key.pem
index d107721f33..752f23619e 100644
--- a/test/org/apache/tomcat/util/net/localhost-rsa-key.pem
+++ b/test/org/apache/tomcat/util/net/localhost-rsa-key.pem
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCIaEaPFZFn7XDP
-078VcpQkT2G1zYQW6XpSildvPaTkizYg79BU7pdtYlGmoRh8Ah+dxxZKg3CFXls4
-w8kFmAbayQ1YXjdobc8je34+mSVuWnpWwkl5ZzlnXhNj6Pj3lbyBRJMM7xz0V3jK
-UlAcCNURvBmdC5/h8qgaAFiTE7ZdjL/hR2RzpNOkN248AckGyBc16cAU7UOhrVSP
-VIwZwpy5gkcQUOtA9PnuEL6JvEFg1Z4qQZnnGu+mkypneUS+0Y+ElUr7OoMWyzKL
-KjKmALFguk47lrsuVzbV3FZ5gri0KXQ4XP0HsUS/hPqlUu/YvuApXTQ+45RHYMyt
-+MFM1YrTAgMBAAECggEAGwbWHBmA4t+Xv4XL0XsPQRZ9XKEor8V42AvTARZsql+u
-zN3XIEzZsfGODf7TNBbTntZIY2EhlTs5xch89t/FU+oL+9tHDSjcpsIcJFkBopjI
-rpH2Lti19fYcz2nkkmGXpOEqZaCm0v7Vzvh6KOPTG51yUbxw5DrI9cXlxtZcBrLH
-cNSAaQ+1o78BiW925s0i6ImUVYH8R3mHdXW+qcTirHHp2omCkj/PQ5FPd+0vZy83
-Q2IJ31+vWPiScNBKzPNr0z+bP4exUmiixpZgl6RlJjqn2Jh27e5q/qEr6fs+OXtE
-gxPwcRY1bqx5zSQVfYk1gGsDz/V+f4eyCGjmgexTgQKBgQC68Dpe9V80s03+z3dl
-/oLymCAC64jBPdDgl9wQlbwK8RU+oJZTbQ3WOoVQ/ajDDqrPEhlThwI4JGEdfFUw
-XqIbAGS575fFsLB8xZQtWS5xwQjF2cMyjZYiadXubDjwDJ/5Nq+1V40kDOFMEjT0
-YdJJBmIWVnGlRPHnU7AT7Wr5wQKBgQC6zQ1kLG6xdtfdEgdam9YnKoEmjoE9BgBl
-FP/xNFine5Cm9NFrxPOMwWSbtxTd84/rLS/1b9uL59kRfBxrBMMlIV6NUQ23dm3i
-XOVj1VkpqyvnEY9oZ96TMFgiZUX+lJ7fF9PkPqsMHhujgJtgly8WqTXnD6wGXxIG
-4srRZUZhkwKBgFLW9ebysVf3RU7vvSdzm6/JfhYNLjMEI7YDVb/7urLWluWD4Fnj
-78fJcx6q6chWjZbpnFOJdpBOfsLEQDQJG6j/iaNj60vtuqfwHnPiG1TJiAu1Lm0O
-lUN2xxi62Jh338ReWYrw21joZEaDovfRCZDWxUzEzePBI7mxOkv6X/eBAoGBAJDH
-YHulXF27CG9VC9IUOhS9AsBJbq1HO4MclYny0ktsn55m3PE0ArezJDDz4v5rSb4y
-lZsaiQSUO08r7DKdzEm45TmN+p2Y8m2hJkEMGEENY8eBeq6m4oEd1RFDgM5hjgjG
-xPmAAL4xj6ZXhRWF138uwpJFOUTu5l/j4uIMJlJ1AoGAFfb8au+XN4BR+IGiHSr+
-7EEdIxqswMPSTJMgmoHTW3LaKl0Vn7VqvTEeopGpRwTmCVg8pNCGQLx9XUWjdN15
-QC5RcS6d1pB6AkC/EH96b3y6j/D+mN/96feHze9hdm7k2va5v5LIMc9r6eraakgI
-467zCaQx2chIKheZ/TW/d/g=
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCx2i5QXFsi24Rh
+XuSd4aQkbJLTllp3Usj3zxa1YICnFQ4SdRq8PwtUOJb2Lwo4bCFo2hNJont8gMeq
+af7jjLHOc+ZbgOI2iUlbA852R781IO7GeN9iqtHXv5Gw/Kr9f1k/ilGffVkP4dbc
+exaAYj9swiwbpQUeQJBgIOHDbT//HHOEkoZZA+VK9tbc5m5oHwVf9yGp/F7m/IvH
+NjQY/NVwIVRa8RDJJMgIkiyRE1Sx2VlwgDmfjJCtydK4vaMoID9nNaLZIOI/Lr49
+iNI7fTtHRHlT4lKYchOuop3+aL02jC5DsTvNUDU9tfcvQ+oeydEQrOgkwYzu5tDC
+Bt4ULRqJAgMBAAECggEAAqX0dvsIodFhzimzbSpMuCdZnObktgPd60UpnYpJLz5k
+fTjQc/X3lVt9zffN2KC7yILhOiTTiZ7eSHiT+AUNN/YTdIJL7cuu7Hj+SZ1QYbMr
+lpYlV2PNRH+vAShpjp4KzWsMpyZJehMmEKStHjzGgEZxWIdBqOSFgA3Tgzf5Q/NS
+OiWNgarUkwVGLDRFH99WWbVmAJEnJeB9pxEQllqb/5AkgeiDD3Mx+BwNgO5GRu4u
+z4BwB6InA4e6T+vBhnPra3qxaS3bPfna1P2Gz7jsH8xOHFt51hIVMCzeVj0/wOWL
+Ie7YinLbCAhIa5YD8F1LTvrzCGuJn+a8Rlt6AXPYDQKBgQD1O0plltNO/3y8WN1i
+c3Ox7sQfTsTj5ZFoW4U6kbAIPF5ByKTBAXdWHWxUwBxoZA+4lgYPEvdwXWPG+VXy
+JXAFbR2/JQO/yROKnodB4O73WZitt81PIHdFP7myEeN5QSjnYSvd6lIiaxe178BM
+qyO/85GgcBf/o3MAQib0UCwXHQKBgQC5qXZjspZd8nC33NP6A6HYawjkrZeVYG8S
+qPgT0ctmsb1EpihK+wU1iAJzECZuTSgoZtcRPL/N17/xgSuwk6nTUJyOdQwnmVP+
++Cfz7lcvx8Dg9FdrmjiEjFHnAYzaZ4bJP5Tub0tsUJRE/7YbhPlvlzaD95USLMKB
+IHzAQWx5XQKBgHgsmgS2qM6pvQK/uZ2pXiTwEQQWob3cnik50EwnYNBoZPhvzu0W
+Ptjgilnt2v39KwcV3do9PSy/V0oGneuQFRlTo6QsC25Mp1ri3P2XsQNd0Mgwrlf8
+XPZ+iA2PXp3pJJZetBSH48AiIvhxiRcJNve18MNiqyAHhS+3O0e2kiSxAoGAL3uY
+rKzK6iIME+nlSMbPCKNvNdTztJ9iKNqP/7mjFJOWfU0ldu+2CFfNkJHr0j/nalXK
+4TyxLTrleyV3AATz5Phz4bcrsaD0K3xZ83fcUnr66E11Yi6iD7w3YiYyWNUrUqLx
+Ov25w2zkTrU7ZNRgWtrIdX3HYUuTPyUI4r6YuH0CgYA+Qs6ZexX1Xys6qBbO2OiR
+6+eRItL12doGDDCO7tqtscf8S3VGSLk29lfwipyz6YhO46yRP2FypqVHYYhwvYuW
+ubXGUUZhzI3JBvqI0Lrtwt0KJ2QUXzfqZqO1cvKe3+gooywmemvzg5s1jZ+/Ys3b
+rQR0KWEn04xhcDMyTr/A9Q==
 -----END PRIVATE KEY-----
diff --git a/test/org/apache/tomcat/util/net/localhost-rsa.jks b/test/org/apache/tomcat/util/net/localhost-rsa.jks
index e9934de44f..fcb9b0c066 100644
Binary files a/test/org/apache/tomcat/util/net/localhost-rsa.jks and b/test/org/apache/tomcat/util/net/localhost-rsa.jks differ
diff --git a/test/org/apache/tomcat/util/net/ocsp-responder-rsa-cert.pem b/test/org/apache/tomcat/util/net/ocsp-responder-rsa-cert.pem
index c918791db1..02d8d5656b 100644
--- a/test/org/apache/tomcat/util/net/ocsp-responder-rsa-cert.pem
+++ b/test/org/apache/tomcat/util/net/ocsp-responder-rsa-cert.pem
@@ -5,31 +5,31 @@ Certificate:
         Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=US, ST=DE, L=Wilmington, O=The Apache Software Foundation, OU=Apache Tomcat PMC, CN=Apache Tomcat Test CA
         Validity
-            Not Before: Aug 12 13:19:18 2026 GMT
-            Not After : Aug 11 13:19:18 2028 GMT
+            Not Before: Dec  5 19:33:55 2025 GMT
+            Not After : Dec  5 19:33:55 2027 GMT
         Subject: C=US, ST=DE, L=Wilmington, O=The Apache Software Foundation, OU=Apache Tomcat PMC, CN=OCSP Responder
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
                 Public-Key: (2048 bit)
                 Modulus:
-                    00:b7:d9:50:06:2b:fa:d5:0b:93:18:f9:cd:8f:b4:
-                    60:0c:5a:d7:78:dd:2b:5a:64:47:c6:5a:21:bf:71:
-                    14:ab:c8:e0:41:d2:a4:66:40:d0:34:f6:3c:1e:f9:
-                    9f:38:52:f7:da:7f:dd:31:43:5c:a9:46:0d:cc:6b:
-                    4e:c8:da:d9:fd:87:aa:0f:c5:7b:3d:b0:3e:a2:b2:
-                    d1:c2:06:05:a8:f6:61:74:01:1d:39:4e:4b:30:87:
-                    be:d9:17:b0:8c:1e:cc:07:ad:10:13:f4:10:81:c6:
-                    be:e4:ad:1e:c1:55:5e:11:0c:ae:f3:79:ee:a9:c5:
-                    6c:0c:de:23:bd:27:3e:37:b3:92:a3:cb:aa:6b:25:
-                    fc:8d:bd:37:30:2b:bc:07:b6:e1:59:14:c3:70:d8:
-                    22:51:55:ad:c3:2f:25:f7:19:5b:82:c7:fe:80:9c:
-                    09:ca:c8:77:84:58:3a:38:7d:47:47:86:5d:dd:27:
-                    4f:4b:ce:2f:6b:d5:24:3c:0e:0a:f8:ae:f8:28:36:
-                    15:f2:8d:7a:ba:93:16:f8:0b:38:52:e5:37:2c:db:
-                    fa:3f:bd:69:91:1d:74:fc:d3:ce:83:19:71:0f:28:
-                    13:67:a0:7f:c1:6a:a2:af:ec:e3:eb:1c:89:1a:a4:
-                    cb:1c:d0:da:68:c8:e5:d4:0b:57:6f:46:4e:e7:98:
-                    99:fd
+                    00:9b:ae:b1:40:e5:e4:84:b6:c3:ec:93:cf:23:63:
+                    51:51:7f:bd:d3:64:1d:e0:23:bb:33:44:f1:47:c6:
+                    f5:d2:4d:2a:13:2a:f4:4c:d2:44:13:56:03:73:16:
+                    30:98:be:66:b1:fb:3c:e9:9c:5a:61:25:b8:47:ef:
+                    72:04:ad:ab:6a:f8:83:fe:00:a6:c0:8b:a3:ef:34:
+                    09:4f:13:e6:fa:96:d3:2b:24:db:e3:d1:4a:40:50:
+                    5f:9f:8f:31:fa:de:42:0d:e6:a2:4a:7a:e6:a6:48:
+                    5a:97:04:b3:b9:bd:52:2e:2f:e9:02:27:1b:8f:bf:
+                    2b:19:28:e8:96:eb:29:d0:6e:39:0b:d9:bf:2a:d2:
+                    3e:65:a4:e0:87:30:ab:26:09:01:ea:4a:a7:a2:38:
+                    09:0e:f5:d3:b8:66:0a:cc:17:61:72:fb:a9:5e:e4:
+                    98:ff:30:e4:93:11:f7:6e:13:f3:76:f6:f4:44:b7:
+                    a8:2a:79:b3:4f:59:d8:67:b7:c0:4c:cd:50:57:d2:
+                    09:65:f5:5e:2d:3b:e7:29:bf:e3:11:ff:37:1d:ad:
+                    f2:cf:3b:ff:f7:49:d1:1a:05:1d:2b:0e:59:fe:fe:
+                    e6:6a:5d:73:7f:0b:8c:b3:6d:c3:65:2a:93:f8:87:
+                    b7:fd:c2:4a:e3:b8:d5:e6:55:8b:b3:e5:0e:4f:f4:
+                    fa:a7
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Basic Constraints: critical
@@ -39,67 +39,67 @@ Certificate:
             X509v3 Extended Key Usage: 
                 OCSP Signing
             X509v3 Subject Key Identifier: 
-                E9:8C:BD:7F:AC:98:97:58:BF:07:67:C4:F3:6F:70:14:01:1C:48:3A
+                FA:23:45:E2:94:8E:6A:88:B8:72:B1:53:EA:2A:AE:B9:39:F8:6A:C8
             X509v3 Authority Key Identifier: 
-                DB:76:66:26:98:CB:BF:69:31:99:2F:95:6C:9E:C2:59:3C:5D:4D:8C
+                AC:87:DC:8B:3D:8A:DB:89:48:7E:6F:3B:1C:C6:70:92:09:17:6F:F9
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        98:95:be:27:df:b2:6b:a6:6a:1a:b1:66:44:97:d1:37:b4:c5:
-        57:c3:ad:7e:3f:92:01:d1:50:ad:bd:06:7f:d5:21:24:49:d8:
-        08:f2:91:ee:50:53:ca:21:38:60:d3:47:ab:3a:ac:12:e8:93:
-        bf:7c:01:f4:22:a7:1c:bf:16:ef:95:0a:fe:b7:2d:7d:74:d5:
-        27:0e:be:6d:cf:87:8f:b4:5c:1e:90:47:91:89:bd:4c:26:6b:
-        84:fc:a4:93:38:e6:4c:5b:f5:9f:72:e6:d9:52:c4:14:74:cc:
-        eb:5c:f4:69:cf:51:a3:dc:ed:7f:fb:66:36:87:ee:26:52:72:
-        8d:d0:c3:88:32:59:c5:f1:2a:9d:9c:81:89:b4:e0:6d:e9:bc:
-        89:1a:87:c3:70:e0:52:27:f3:d0:27:5d:4f:b8:ca:9b:e4:e7:
-        34:2e:a6:1a:90:18:8a:d6:d4:87:4f:ee:66:1c:57:7f:1b:e0:
-        9b:66:63:85:7b:4c:8b:28:0a:e6:eb:23:50:24:29:11:f3:ee:
-        24:be:fb:2c:fe:1f:51:6b:a2:c2:95:ef:9f:c0:1e:90:ff:43:
-        f1:b2:5d:95:7c:44:40:ca:d0:b5:32:58:b0:b6:39:78:56:e4:
-        ec:26:f2:d8:df:2b:22:27:7a:7a:f0:de:b7:78:c7:b6:11:e9:
-        67:d1:40:40:77:ce:9f:b0:e5:c0:19:6b:86:ae:30:1e:63:4f:
-        ef:a5:1a:a9:dc:0f:e0:19:e2:7c:e5:5e:c7:3b:cb:7a:15:60:
-        39:b5:30:0b:6a:01:56:8f:43:5f:79:87:8d:39:4a:39:54:1e:
-        5f:7e:58:6b:ca:26:48:b5:e6:33:03:e4:cb:ec:90:cc:cc:f2:
-        11:ec:c4:cc:35:e9:fe:18:eb:45:63:c4:a3:ca:95:cb:71:92:
-        dc:ae:8d:98:03:5b:56:0b:06:d4:f7:3c:55:1e:9d:b9:4e:46:
-        82:2f:d1:18:ea:a1:d9:8b:07:1f:d4:03:d5:6b:e9:54:34:5b:
-        e7:20:0a:18:33:66:c5:7d:d0:4a:06:f8:82:e7:2a:b2:7d:d9:
-        ba:b5:4f:0b:00:e5:bf:07:14:da:9e:1f:19:09:93:c8:3b:ba:
-        c8:8d:15:79:4f:2e:b0:bb:cc:de:32:fb:8f:57:77:f2:2f:0b:
-        ac:fd:d6:07:75:b3:42:5e:17:51:41:39:cf:69:c4:c8:ba:ce:
-        44:d9:44:a8:cd:27:e8:f2:af:0f:75:f6:1c:89:1d:48:af:b0:
-        cc:21:c9:f1:93:09:6b:f5:7d:cb:61:92:99:4b:c4:50:20:86:
-        97:cb:f7:12:03:f0:4c:1e:bf:2a:4c:5b:08:6e:d4:41:87:30:
-        71:8d:69:e4:4a:b3:6b:e5
+        3b:39:47:9e:28:f1:c0:46:eb:a8:de:0e:44:63:4d:3c:f4:59:
+        c1:a4:2a:eb:6a:e5:50:76:ea:76:f7:a9:ca:a2:cb:70:91:c9:
+        d3:c5:fd:d6:c9:86:3d:ad:f2:b8:a7:e4:b1:93:09:44:eb:27:
+        30:01:85:13:db:0a:62:f0:0f:fa:59:de:af:93:1a:9e:df:07:
+        da:b8:ec:19:c1:c9:56:f9:a6:8e:4e:03:ae:e0:f9:d8:d2:b7:
+        d2:94:4a:70:95:b7:a8:7f:42:b2:1d:43:77:3a:9e:f8:76:93:
+        4b:3a:48:09:5a:8b:3b:2c:38:97:ed:27:6b:d5:31:0b:f0:3d:
+        a9:dc:d4:0b:96:55:07:41:59:e1:1f:68:70:47:04:6a:11:a4:
+        81:e7:7d:75:08:15:9f:ca:20:20:69:fe:ef:50:3f:cf:02:0b:
+        96:4a:9e:e7:ce:08:07:8a:c0:93:a6:aa:a9:91:53:ac:5e:80:
+        3b:bd:6f:cb:d2:7c:e3:9b:cd:ff:b0:12:ec:9a:71:48:e1:01:
+        96:21:f4:ee:bb:f8:1d:99:77:00:68:ef:e3:bc:5d:1d:58:bc:
+        91:88:51:39:93:b1:91:88:5c:d0:9d:0f:87:0b:0d:04:ca:be:
+        79:05:b9:42:ae:b3:62:df:7a:02:d7:d5:4e:a8:27:8f:0b:b8:
+        4c:aa:d5:07:a6:e4:65:b0:13:78:cd:3a:3b:10:58:49:13:d7:
+        74:88:76:8a:77:a4:d4:24:01:61:fe:0b:46:fb:4e:15:3a:fa:
+        2b:c3:ca:10:9c:5f:2b:f5:33:21:93:16:be:a4:c5:bd:a4:80:
+        88:74:2a:1e:09:d4:2a:c6:af:ed:be:46:7f:b8:d7:ad:a6:e0:
+        8f:92:ae:2b:8a:97:ca:9c:fb:21:29:48:f1:38:98:09:f9:2b:
+        55:53:7c:99:a5:23:21:58:35:1a:36:15:67:79:80:3f:fc:94:
+        60:94:2b:78:a5:f1:81:b4:51:5c:08:1a:50:24:21:da:0b:cc:
+        db:d7:3c:7d:d8:2c:b1:93:9d:f4:94:bb:fe:37:ad:8d:3f:06:
+        9d:83:b0:e5:f2:ef:e4:88:75:e9:50:3a:f3:ef:aa:e4:00:54:
+        ad:1d:cd:a7:6b:ec:0e:b7:31:92:82:da:0d:4b:c3:27:ee:7a:
+        a8:f4:e0:a9:0a:f1:40:61:a0:09:a5:fb:24:f9:68:34:28:a9:
+        1b:b6:5a:bd:aa:3a:c4:b8:89:92:ba:92:9c:81:f8:a8:ff:5a:
+        0c:ef:af:97:b4:86:09:71:e8:13:28:1c:89:16:6f:43:de:1b:
+        2f:1d:16:9f:37:7f:9c:5f:4e:4a:a8:22:4b:77:9e:f6:94:f8:
+        d9:05:4b:bc:a6:aa:f7:6e
 -----BEGIN CERTIFICATE-----
 MIIFFDCCAvygAwIBAgICEAUwDQYJKoZIhvcNAQELBQAwgZQxCzAJBgNVBAYTAlVT
 MQswCQYDVQQIEwJERTETMBEGA1UEBxMKV2lsbWluZ3RvbjEnMCUGA1UEChMeVGhl
 IEFwYWNoZSBTb2Z0d2FyZSBGb3VuZGF0aW9uMRowGAYDVQQLExFBcGFjaGUgVG9t
-Y2F0IFBNQzEeMBwGA1UEAxMVQXBhY2hlIFRvbWNhdCBUZXN0IENBMB4XDTI2MDgx
-MjEzMTkxOFoXDTI4MDgxMTEzMTkxOFowgY0xCzAJBgNVBAYTAlVTMQswCQYDVQQI
+Y2F0IFBNQzEeMBwGA1UEAxMVQXBhY2hlIFRvbWNhdCBUZXN0IENBMB4XDTI1MTIw
+NTE5MzM1NVoXDTI3MTIwNTE5MzM1NVowgY0xCzAJBgNVBAYTAlVTMQswCQYDVQQI
 EwJERTETMBEGA1UEBxMKV2lsbWluZ3RvbjEnMCUGA1UEChMeVGhlIEFwYWNoZSBT
 b2Z0d2FyZSBGb3VuZGF0aW9uMRowGAYDVQQLExFBcGFjaGUgVG9tY2F0IFBNQzEX
 MBUGA1UEAxMOT0NTUCBSZXNwb25kZXIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQC32VAGK/rVC5MY+c2PtGAMWtd43StaZEfGWiG/cRSryOBB0qRmQNA0
-9jwe+Z84Uvfaf90xQ1ypRg3Ma07I2tn9h6oPxXs9sD6istHCBgWo9mF0AR05Tksw
-h77ZF7CMHswHrRAT9BCBxr7krR7BVV4RDK7zee6pxWwM3iO9Jz43s5Kjy6prJfyN
-vTcwK7wHtuFZFMNw2CJRVa3DLyX3GVuCx/6AnAnKyHeEWDo4fUdHhl3dJ09Lzi9r
-1SQ8Dgr4rvgoNhXyjXq6kxb4CzhS5Tcs2/o/vWmRHXT8086DGXEPKBNnoH/BaqKv
-7OPrHIkapMsc0NpoyOXUC1dvRk7nmJn9AgMBAAGjdTBzMAwGA1UdEwEB/wQCMAAw
-DgYDVR0PAQH/BAQDAgeAMBMGA1UdJQQMMAoGCCsGAQUFBwMJMB0GA1UdDgQWBBTp
-jL1/rJiXWL8HZ8Tzb3AUARxIOjAfBgNVHSMEGDAWgBTbdmYmmMu/aTGZL5VsnsJZ
-PF1NjDANBgkqhkiG9w0BAQsFAAOCAgEAmJW+J9+ya6ZqGrFmRJfRN7TFV8Otfj+S
-AdFQrb0Gf9UhJEnYCPKR7lBTyiE4YNNHqzqsEuiTv3wB9CKnHL8W75UK/rctfXTV
-Jw6+bc+Hj7RcHpBHkYm9TCZrhPykkzjmTFv1n3Lm2VLEFHTM61z0ac9Ro9ztf/tm
-NofuJlJyjdDDiDJZxfEqnZyBibTgbem8iRqHw3DgUifz0CddT7jKm+TnNC6mGpAY
-itbUh0/uZhxXfxvgm2ZjhXtMiygK5usjUCQpEfPuJL77LP4fUWuiwpXvn8AekP9D
-8bJdlXxEQMrQtTJYsLY5eFbk7Cby2N8rIid6evDet3jHthHpZ9FAQHfOn7DlwBlr
-hq4wHmNP76UaqdwP4BnifOVexzvLehVgObUwC2oBVo9DX3mHjTlKOVQeX35Ya8om
-SLXmMwPky+yQzMzyEezEzDXp/hjrRWPEo8qVy3GS3K6NmANbVgsG1Pc8VR6duU5G
-gi/RGOqh2YsHH9QD1WvpVDRb5yAKGDNmxX3QSgb4gucqsn3ZurVPCwDlvwcU2p4f
-GQmTyDu6yI0VeU8usLvM3jL7j1d38i8LrP3WB3WzQl4XUUE5z2nEyLrORNlEqM0n
-6PKvD3X2HIkdSK+wzCHJ8ZMJa/V9y2GSmUvEUCCGl8v3EgPwTB6/KkxbCG7UQYcw
-cY1p5Eqza+U=
+ggEKAoIBAQCbrrFA5eSEtsPsk88jY1FRf73TZB3gI7szRPFHxvXSTSoTKvRM0kQT
+VgNzFjCYvmax+zzpnFphJbhH73IEratq+IP+AKbAi6PvNAlPE+b6ltMrJNvj0UpA
+UF+fjzH63kIN5qJKeuamSFqXBLO5vVIuL+kCJxuPvysZKOiW6ynQbjkL2b8q0j5l
+pOCHMKsmCQHqSqeiOAkO9dO4ZgrMF2Fy+6le5Jj/MOSTEfduE/N29vREt6gqebNP
+Wdhnt8BMzVBX0gll9V4tO+cpv+MR/zcdrfLPO//3SdEaBR0rDln+/uZqXXN/C4yz
+bcNlKpP4h7f9wkrjuNXmVYuz5Q5P9PqnAgMBAAGjdTBzMAwGA1UdEwEB/wQCMAAw
+DgYDVR0PAQH/BAQDAgeAMBMGA1UdJQQMMAoGCCsGAQUFBwMJMB0GA1UdDgQWBBT6
+I0XilI5qiLhysVPqKq65OfhqyDAfBgNVHSMEGDAWgBSsh9yLPYrbiUh+bzscxnCS
+CRdv+TANBgkqhkiG9w0BAQsFAAOCAgEAOzlHnijxwEbrqN4ORGNNPPRZwaQq62rl
+UHbqdvepyqLLcJHJ08X91smGPa3yuKfksZMJROsnMAGFE9sKYvAP+lner5Mant8H
+2rjsGcHJVvmmjk4DruD52NK30pRKcJW3qH9Csh1Ddzqe+HaTSzpICVqLOyw4l+0n
+a9UxC/A9qdzUC5ZVB0FZ4R9ocEcEahGkged9dQgVn8ogIGn+71A/zwILlkqe584I
+B4rAk6aqqZFTrF6AO71vy9J845vN/7AS7JpxSOEBliH07rv4HZl3AGjv47xdHVi8
+kYhROZOxkYhc0J0PhwsNBMq+eQW5Qq6zYt96AtfVTqgnjwu4TKrVB6bkZbATeM06
+OxBYSRPXdIh2inek1CQBYf4LRvtOFTr6K8PKEJxfK/UzIZMWvqTFvaSAiHQqHgnU
+Ksav7b5Gf7jXrabgj5KuK4qXypz7ISlI8TiYCfkrVVN8maUjIVg1GjYVZ3mAP/yU
+YJQreKXxgbRRXAgaUCQh2gvM29c8fdgssZOd9JS7/jetjT8GnYOw5fLv5Ih16VA6
+8++q5ABUrR3Np2vsDrcxkoLaDUvDJ+56qPTgqQrxQGGgCaX7JPloNCipG7Zavao6
+xLiJkrqSnIH4qP9aDO+vl7SGCXHoEygciRZvQ94bLx0Wnzd/nF9OSqgiS3ee9pT4
+2QVLvKaq924=
 -----END CERTIFICATE-----
diff --git a/test/org/apache/tomcat/util/net/ocsp-responder-rsa-key.pem b/test/org/apache/tomcat/util/net/ocsp-responder-rsa-key.pem
index c9db06a2e4..1b5c681c93 100644
--- a/test/org/apache/tomcat/util/net/ocsp-responder-rsa-key.pem
+++ b/test/org/apache/tomcat/util/net/ocsp-responder-rsa-key.pem
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC32VAGK/rVC5MY
-+c2PtGAMWtd43StaZEfGWiG/cRSryOBB0qRmQNA09jwe+Z84Uvfaf90xQ1ypRg3M
-a07I2tn9h6oPxXs9sD6istHCBgWo9mF0AR05Tkswh77ZF7CMHswHrRAT9BCBxr7k
-rR7BVV4RDK7zee6pxWwM3iO9Jz43s5Kjy6prJfyNvTcwK7wHtuFZFMNw2CJRVa3D
-LyX3GVuCx/6AnAnKyHeEWDo4fUdHhl3dJ09Lzi9r1SQ8Dgr4rvgoNhXyjXq6kxb4
-CzhS5Tcs2/o/vWmRHXT8086DGXEPKBNnoH/BaqKv7OPrHIkapMsc0NpoyOXUC1dv
-Rk7nmJn9AgMBAAECggEAD4JJAmRGYh96VrKH+TXtnk0xfRQnOpZYCa8DxssKw90L
-sfHLhYa1KaqV8sT6/fzdxLRhm+zDTdJHirWIrV/s4LrHiVIO7erGteHg2P26D4FN
-QkRvyyxEIoFpA5ZAgel9K66ZOx2tIM17v/2sqQGDEGwh/A8Op4qsbT92A1hior8h
-9MDlnQkZphQEzDDAfNgf+xC3UhwrnphopnDbkuoXC6jB6WnUfiDOAY3NQJwFTJcc
-CcXQ9YyWfAXF1K2rem0EVW50br1DwSFVbArlAUWUOfpbXEJXowpsNmq/wT+Wc9In
-9t/BlKR+v3hGP6cbYiMPmOduTRcnF1YEqPAdMt5h3wKBgQDwmdL49Zk9EGeZBlhy
-xE6RQsH2mJsLyES/+0KACVap7l0cDcSzX4+7ZbnwUPS7tlrPesBDxRtmb7sNN2Ge
-+wDEi0NW1T5nR24LTBIlItcpUfHjwOwuAEwzyVGOIYwgKvLwKn2X51gkrLHM3TJL
-Sp8XnUEZit8iYA7wqiIbwBVD3wKBgQDDnZ+VnAr9zvyIIqs5QqNiNP3hkw8A4BKn
-Z06+5eGI9VIndYQD4ZZ/TcoUWzEf5tD/9D+a6triVPkyVzx4lOQui4YkrTefXeLr
-PZDipt72JOIzRNVb0qk8KUzacIoE3K2KuvAuGhv3fyqeSv+n9Og9casoIIyE2TpV
-0wU3EWX9owKBgELfDhMh98hQEesnJ1gmlYusGUrXmWhJ7knJpO7/KXYriPduIDiW
-m9VC7c4MQikWAuFdxahQVVBAR6XhuaE9NDZsWnf85s4/vScoqnZl25VhcDCUA1C5
-xnQyRReS3WZnaYQ02xloNEhlMzm0VPE2OUeP7nMR9PiR6DUdpENAPOjTAoGAJ6Hh
-2U/6Mh4jr/lGM526uIUAAxnmakj7vosBu0+b+EGr2W7HxnmIIlbCYIlxVINRSOpV
-kK+QlVad/oMKL2wLJxsBnKCzqkg9V2fr2N/yQHCMm9KQX8A4pYXAmmk+rWmAh6EE
-VHLZw7UyD0wmrALEot5KzSB7F9djKExOvC98OH0CgYEAlwmuRH7qbXVICZj6/GPk
-+0fo6P1JwicPKr6e0y9yE81VXEkiAcAXWIFl3D+8Cctw4f7YPotF6AmvanD7ccTC
-uCVl5R6RqXSPh0qMSZbB4WN9ZwbCPBH16mSRd1BiEJKsl5ytWdt/6VGCyxNEfaCA
-zhR8j9zxBX8B/SPUlTbYyPU=
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCbrrFA5eSEtsPs
+k88jY1FRf73TZB3gI7szRPFHxvXSTSoTKvRM0kQTVgNzFjCYvmax+zzpnFphJbhH
+73IEratq+IP+AKbAi6PvNAlPE+b6ltMrJNvj0UpAUF+fjzH63kIN5qJKeuamSFqX
+BLO5vVIuL+kCJxuPvysZKOiW6ynQbjkL2b8q0j5lpOCHMKsmCQHqSqeiOAkO9dO4
+ZgrMF2Fy+6le5Jj/MOSTEfduE/N29vREt6gqebNPWdhnt8BMzVBX0gll9V4tO+cp
+v+MR/zcdrfLPO//3SdEaBR0rDln+/uZqXXN/C4yzbcNlKpP4h7f9wkrjuNXmVYuz
+5Q5P9PqnAgMBAAECggEAALCpC3sZZLc0rh9Hm0YM7boNutqmQUCXS1ZiZWmN3GVI
+KvaVR6Pk9lr6v+9YvsyVQvO0pOpzAhw7MWJv1HJ6oIpCd4VEN/VGgEBwTB/v9atm
+ezn6GYvrctaIXfoyBAUpMMuVa5QY4qLOd/3m2AttSlQfCcnnlt8Hj2B9i3G2aTya
+EgwH9GKBoQ0FIMP3Znytx2YEj2dMk2wxApafNhxpZ302JZgvQG163UovQeGfJXvN
+d0xwtA8Xyzuv+/l1Bx8KyD0dYjeA6++khJ/oDNkM1+JKfN6qRzIhcNYWZAx6Au78
+tJwhBuUVqpbZnPkMXwyFjnAMvzSRcJrGIHdrIyPsWQKBgQDIgbcgiECHldkdrIUF
+3qKluX8g8mLTGts/wXG20iY730KThAnbxJ0ORPD5S3HZDSKZkG31ohoZHH7YT9iC
+0+pnu4bEhqtfPttXIK9q3PQh6i5jhiENc2x0NvJ0nUg8DkVqVmnmC3eIVIHfnnUU
+PDhe0GjHC02TegBFXfOFz3LDSQKBgQDGxRa4tKtB/0BeJCu4RD7pHuikt+NUKS7n
+4F3QBpyIzchjImIlHbutFwIbmUQ6C5TzEcgnTDAlJadBmljZYemaX5RN1UEPulPT
+NvSOdGdxyhJmKpFX+umUbypAcpKC6+EElaOuCUphMDOISIyooKUtJqWUXTVgO60x
+2vh94BHebwKBgGpIL/0DnEkCikLrdtukpsx35kZdlTrXio5iCNfizzd/Ybf2Do+6
+yZGNw7oxXpiyGLwTzeWdVn4nF6mrsVWv5Rm1UnuL8v0awYOOpM1db98mVg6VQ6Hw
+o/V6Rsy/rlF/MxZp1dqGC4dtXCZfxSnDvhGsIU4Y1LcuvUQHyBUO4INZAoGAPATV
+GI7NS49Uk1iervREfsXrf5lbFlWdKT0RdrgYWiKxCGYgdo6k1d4lr8m21UQcBM1w
+v5T80Kqu91swyusKy6dis6HaFHKxzwxACifR+IUIyzq9SnCkSULL4kv2O3wYJPc+
+RlXd1LzmQpeNiXmAhsKtqr/+VwGOCYjSEcgv/RcCgYBfUrsTG3dgWUVKviFzS63R
+nb0T9yKZij79HkIM0bROpaU5atTgQa/iwvSktw8mHGuJkjQZ6BqVpKHbDOq/Y/zB
+NihYIlf4WUPlQVr/sBLzfTtaxBKcnuVm1d8igKK3qQ0XuH5jk0gD6tzaU4ySTJ+P
+ldxvbWraHRcPzn08xJ6+UA==
 -----END PRIVATE KEY-----
diff --git a/test/org/apache/tomcat/util/net/user1.jks b/test/org/apache/tomcat/util/net/user1.jks
index 821e5df692..727de3cccc 100644
Binary files a/test/org/apache/tomcat/util/net/user1.jks and b/test/org/apache/tomcat/util/net/user1.jks differ
diff --git a/test/org/apache/tomcat/util/net/user2-crl.jks b/test/org/apache/tomcat/util/net/user2-crl.jks
index f1c6f63bc2..068517b598 100644
Binary files a/test/org/apache/tomcat/util/net/user2-crl.jks and b/test/org/apache/tomcat/util/net/user2-crl.jks differ
diff --git a/test/org/apache/tomcat/util/net/user3-crl-long.jks b/test/org/apache/tomcat/util/net/user3-crl-long.jks
index f43fe75f7b..be14f575cb 100644
Binary files a/test/org/apache/tomcat/util/net/user3-crl-long.jks and b/test/org/apache/tomcat/util/net/user3-crl-long.jks differ
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.