diff --git a/luni/src/test/java/libcore/java/security/cert/FakeOidProvider.java b/luni/src/test/java/libcore/java/security/cert/FakeOidProvider.java
new file mode 100644
index 0000000..bf81787
--- /dev/null
+++ b/luni/src/test/java/libcore/java/security/cert/FakeOidProvider.java
@@ -0,0 +1,73 @@
+package libcore.java.security.cert;
+
+import java.security.InvalidKeyException;
+import java.security.InvalidParameterException;
+import java.security.PrivateKey;
+import java.security.Provider;
+import java.security.PublicKey;
+import java.security.SignatureException;
+import java.security.SignatureSpi;
+
+public class FakeOidProvider extends Provider {
+    /**
+     * Used for testing some effects of algorithm OID mapping. We have to be
+     * slightly careful of the OID we pick here: the first number has to be 0,
+     * 1, or 2, and the second number has to be less than 39.
+     *
+     * X509CertificateTest depends on this value as it assumes it can
+     * OR the middle 3 bytes of the RSA signature OID with 0xff to get this
+     * value.
+     */
+    public static final String SIGALG_OID = "1.2.34359737229.1.1.11";
+
+    /**
+     * Used for testing some effects of algorithm OID mapping.
+     */
+    public static final String SIGALG_OID_NAME = "FAKEwithFAKE";
+
+    public static final String PROVIDER_NAME = "FakeOidProvider";
+
+    protected FakeOidProvider() {
+        super(PROVIDER_NAME, 1.0, "Fake OID Provider for Tests");
+
+        put("Signature." + SIGALG_OID, FakeOidSignature.class.getName());
+    }
+
+    public static class FakeOidSignature extends SignatureSpi {
+        @Override
+        protected void engineInitVerify(PublicKey publicKey) throws InvalidKeyException {
+        }
+
+        @Override
+        protected void engineInitSign(PrivateKey privateKey) throws InvalidKeyException {
+        }
+
+        @Override
+        protected void engineUpdate(byte b) throws SignatureException {
+        }
+
+        @Override
+        protected void engineUpdate(byte[] b, int off, int len) throws SignatureException {
+        }
+
+        @Override
+        protected byte[] engineSign() throws SignatureException {
+            return null;
+        }
+
+        @Override
+        protected boolean engineVerify(byte[] sigBytes) throws SignatureException {
+            return true;
+        }
+
+        @Override
+        protected void engineSetParameter(String param, Object value)
+                throws InvalidParameterException {
+        }
+
+        @Override
+        protected Object engineGetParameter(String param) throws InvalidParameterException {
+            return null;
+        }
+    }
+}
diff --git a/luni/src/test/java/libcore/java/security/cert/X509CertificateTest.java b/luni/src/test/java/libcore/java/security/cert/X509CertificateTest.java
index 14c22ef..06cdda3 100644
--- a/luni/src/test/java/libcore/java/security/cert/X509CertificateTest.java
+++ b/luni/src/test/java/libcore/java/security/cert/X509CertificateTest.java
@@ -604,45 +604,41 @@
 
     private void getSigAlgName(CertificateFactory f) throws Exception {
         {
-            /* The test certificate is sha1WithRSAEncryption */
+            /* The test certificate is sha256WithRSAEncryption */
             X509Certificate c = getCertificate(f, CERT_RSA);
-            assertEquals("SHA1WITHRSA", c.getSigAlgName().toUpperCase(Locale.US));
+            assertEquals("SHA256WITHRSA", c.getSigAlgName().toUpperCase(Locale.US));
         }
 
         {
-            /* The test certificate is sha1WithRSAEncryption */
+            /* The test certificate is sha256WithDSAEncryption */
             X509Certificate c = getCertificate(f, CERT_DSA);
-            assertEquals("SHA1WITHDSA", c.getSigAlgName().toUpperCase(Locale.US));
+            assertEquals("SHA256WITHDSA", c.getSigAlgName().toUpperCase(Locale.US));
         }
 
         {
-            /* The test certificate is sha1WithRSAEncryption */
+            /* The test certificate is sha256WithECDSAEncryption */
             X509Certificate c = getCertificate(f, CERT_EC);
-            if (StandardNames.IS_RI) {
-                assertEquals("SHA1WITHECDSA", c.getSigAlgName().toUpperCase(Locale.US));
-            } else {
-                assertEquals("ECDSA", c.getSigAlgName().toUpperCase(Locale.US));
-            }
+            assertEquals("SHA256WITHECDSA", c.getSigAlgName().toUpperCase(Locale.US));
         }
     }
 
     private void getSigAlgOID(CertificateFactory f) throws Exception {
         {
-            /* The test certificate is sha1WithRSAEncryption */
+            /* The test certificate is sha256WithRSAEncryption */
             X509Certificate c = getCertificate(f, CERT_RSA);
-            assertEquals("1.2.840.113549.1.1.5", c.getSigAlgOID());
+            assertEquals("1.2.840.113549.1.1.11", c.getSigAlgOID());
         }
 
         {
-            /* The test certificate is sha1WithRSAEncryption */
+            /* The test certificate is sha256WithDSAEncryption */
             X509Certificate c = getCertificate(f, CERT_DSA);
-            assertEquals("1.2.840.10040.4.3", c.getSigAlgOID());
+            assertEquals("2.16.840.1.101.3.4.3.2", c.getSigAlgOID());
         }
 
         {
-            /* The test certificate is sha1WithRSAEncryption */
+            /* The test certificate is sha256WithECDSAEncryption */
             X509Certificate c = getCertificate(f, CERT_EC);
-            assertEquals("1.2.840.10045.4.1", c.getSigAlgOID());
+            assertEquals("1.2.840.10045.4.3.2", c.getSigAlgOID());
         }
     }
 
@@ -688,7 +684,7 @@
 
     private void getKeyUsage(CertificateFactory f) throws Exception {
         {
-            /* The test certificate is sha1WithRSAEncryption */
+            /* The test certificate is sha256WithRSAEncryption */
             X509Certificate c = getCertificate(f, CERT_RSA);
             boolean[] expected = new boolean[] {
                     true,  /* digitalSignature (0) */
@@ -705,7 +701,7 @@
         }
 
         {
-            /* The test certificate is sha1WithRSAEncryption */
+            /* The test certificate is sha256WithDSAEncryption */
             X509Certificate c = getCertificate(f, CERT_DSA);
             boolean[] expected = new boolean[] {
                     false, /* digitalSignature (0) */
@@ -724,7 +720,7 @@
         }
 
         {
-            /* The test certificate is sha1WithRSAEncryption */
+            /* The test certificate is sha256WithECDSAEncryption */
             X509Certificate c = getCertificate(f, CERT_EC);
             boolean[] expected = new boolean[] {
                     false, /* digitalSignature (0) */
diff --git a/support/src/test/java/tests/resources/x509/cert-alt-dirname.der b/support/src/test/java/tests/resources/x509/cert-alt-dirname.der
index cf065c1..d786f68 100644
--- a/support/src/test/java/tests/resources/x509/cert-alt-dirname.der
+++ b/support/src/test/java/tests/resources/x509/cert-alt-dirname.der
Binary files differ
diff --git a/support/src/test/java/tests/resources/x509/cert-alt-dns.der b/support/src/test/java/tests/resources/x509/cert-alt-dns.der
index 0b902c9..130f8cf 100644
--- a/support/src/test/java/tests/resources/x509/cert-alt-dns.der
+++ b/support/src/test/java/tests/resources/x509/cert-alt-dns.der
Binary files differ
diff --git a/support/src/test/java/tests/resources/x509/cert-alt-email.der b/support/src/test/java/tests/resources/x509/cert-alt-email.der
index 067b701..8969a79 100644
--- a/support/src/test/java/tests/resources/x509/cert-alt-email.der
+++ b/support/src/test/java/tests/resources/x509/cert-alt-email.der
Binary files differ
diff --git a/support/src/test/java/tests/resources/x509/cert-alt-none.der b/support/src/test/java/tests/resources/x509/cert-alt-none.der
index 3781325..143e140 100644
--- a/support/src/test/java/tests/resources/x509/cert-alt-none.der
+++ b/support/src/test/java/tests/resources/x509/cert-alt-none.der
Binary files differ
diff --git a/support/src/test/java/tests/resources/x509/cert-alt-other.der b/support/src/test/java/tests/resources/x509/cert-alt-other.der
index 07b6fb6..a7838f4 100644
--- a/support/src/test/java/tests/resources/x509/cert-alt-other.der
+++ b/support/src/test/java/tests/resources/x509/cert-alt-other.der
Binary files differ
diff --git a/support/src/test/java/tests/resources/x509/cert-alt-rid.der b/support/src/test/java/tests/resources/x509/cert-alt-rid.der
index 82a4051..faa52d6 100644
--- a/support/src/test/java/tests/resources/x509/cert-alt-rid.der
+++ b/support/src/test/java/tests/resources/x509/cert-alt-rid.der
Binary files differ
diff --git a/support/src/test/java/tests/resources/x509/cert-alt-uri.der b/support/src/test/java/tests/resources/x509/cert-alt-uri.der
index d706d1e..81cb8de 100644
--- a/support/src/test/java/tests/resources/x509/cert-alt-uri.der
+++ b/support/src/test/java/tests/resources/x509/cert-alt-uri.der
Binary files differ
diff --git a/support/src/test/java/tests/resources/x509/cert-ca.der b/support/src/test/java/tests/resources/x509/cert-ca.der
index 4d3712a..ecacbfc 100644
--- a/support/src/test/java/tests/resources/x509/cert-ca.der
+++ b/support/src/test/java/tests/resources/x509/cert-ca.der
Binary files differ
diff --git a/support/src/test/java/tests/resources/x509/cert-caWithPathLen.der b/support/src/test/java/tests/resources/x509/cert-caWithPathLen.der
index 2f1ab9e..1007caa 100644
--- a/support/src/test/java/tests/resources/x509/cert-caWithPathLen.der
+++ b/support/src/test/java/tests/resources/x509/cert-caWithPathLen.der
Binary files differ
diff --git a/support/src/test/java/tests/resources/x509/cert-dsa.der b/support/src/test/java/tests/resources/x509/cert-dsa.der
index 0f60f2d..67bcb78 100644
--- a/support/src/test/java/tests/resources/x509/cert-dsa.der
+++ b/support/src/test/java/tests/resources/x509/cert-dsa.der
Binary files differ
diff --git a/support/src/test/java/tests/resources/x509/cert-ec.der b/support/src/test/java/tests/resources/x509/cert-ec.der
index 2d30151..a9f53b1 100644
--- a/support/src/test/java/tests/resources/x509/cert-ec.der
+++ b/support/src/test/java/tests/resources/x509/cert-ec.der
Binary files differ
diff --git a/support/src/test/java/tests/resources/x509/cert-extendedKeyUsage.der b/support/src/test/java/tests/resources/x509/cert-extendedKeyUsage.der
index 74e8fe4..ce3e5e3 100644
--- a/support/src/test/java/tests/resources/x509/cert-extendedKeyUsage.der
+++ b/support/src/test/java/tests/resources/x509/cert-extendedKeyUsage.der
Binary files differ
diff --git a/support/src/test/java/tests/resources/x509/cert-ipv6.der b/support/src/test/java/tests/resources/x509/cert-ipv6.der
index 904c33c..a6b02a1 100644
--- a/support/src/test/java/tests/resources/x509/cert-ipv6.der
+++ b/support/src/test/java/tests/resources/x509/cert-ipv6.der
Binary files differ
diff --git a/support/src/test/java/tests/resources/x509/cert-keyUsage-extraLong.der b/support/src/test/java/tests/resources/x509/cert-keyUsage-extraLong.der
index 4b98f6a..f0ce8e1 100644
--- a/support/src/test/java/tests/resources/x509/cert-keyUsage-extraLong.der
+++ b/support/src/test/java/tests/resources/x509/cert-keyUsage-extraLong.der
Binary files differ
diff --git a/support/src/test/java/tests/resources/x509/cert-rsa-dates.txt b/support/src/test/java/tests/resources/x509/cert-rsa-dates.txt
index 654000d..56b8d8f 100644
--- a/support/src/test/java/tests/resources/x509/cert-rsa-dates.txt
+++ b/support/src/test/java/tests/resources/x509/cert-rsa-dates.txt
@@ -1,2 +1,2 @@
-notBefore=Jan 28 21:42:14 2014 GMT
-notAfter=Jan 26 21:42:14 2024 GMT
+notBefore=Jan 28 11:35:10 2024 GMT
+notAfter=Jan 25 11:35:10 2034 GMT
diff --git a/support/src/test/java/tests/resources/x509/cert-rsa-sig.der b/support/src/test/java/tests/resources/x509/cert-rsa-sig.der
index e291aa5..28ac0cc 100644
--- a/support/src/test/java/tests/resources/x509/cert-rsa-sig.der
+++ b/support/src/test/java/tests/resources/x509/cert-rsa-sig.der
Binary files differ
diff --git a/support/src/test/java/tests/resources/x509/cert-rsa-tbs.der b/support/src/test/java/tests/resources/x509/cert-rsa-tbs.der
index ffae8c0..5ddc1aa 100644
--- a/support/src/test/java/tests/resources/x509/cert-rsa-tbs.der
+++ b/support/src/test/java/tests/resources/x509/cert-rsa-tbs.der
Binary files differ
diff --git a/support/src/test/java/tests/resources/x509/cert-rsa.der b/support/src/test/java/tests/resources/x509/cert-rsa.der
index 12b3595..d500390 100644
--- a/support/src/test/java/tests/resources/x509/cert-rsa.der
+++ b/support/src/test/java/tests/resources/x509/cert-rsa.der
Binary files differ
diff --git a/support/src/test/java/tests/resources/x509/cert-unsupported.der b/support/src/test/java/tests/resources/x509/cert-unsupported.der
index ff7004e..b15c533 100644
--- a/support/src/test/java/tests/resources/x509/cert-unsupported.der
+++ b/support/src/test/java/tests/resources/x509/cert-unsupported.der
Binary files differ
diff --git a/support/src/test/java/tests/resources/x509/cert-userWithPathLen.der b/support/src/test/java/tests/resources/x509/cert-userWithPathLen.der
index 6f166a9..463c832 100644
--- a/support/src/test/java/tests/resources/x509/cert-userWithPathLen.der
+++ b/support/src/test/java/tests/resources/x509/cert-userWithPathLen.der
Binary files differ
diff --git a/support/src/test/java/tests/resources/x509/certs-pk7.der b/support/src/test/java/tests/resources/x509/certs-pk7.der
index 677d4c0..4e636a6 100644
--- a/support/src/test/java/tests/resources/x509/certs-pk7.der
+++ b/support/src/test/java/tests/resources/x509/certs-pk7.der
Binary files differ
diff --git a/support/src/test/java/tests/resources/x509/certs-pk7.pem b/support/src/test/java/tests/resources/x509/certs-pk7.pem
index 89d0962..209ec84 100644
--- a/support/src/test/java/tests/resources/x509/certs-pk7.pem
+++ b/support/src/test/java/tests/resources/x509/certs-pk7.pem
@@ -1,9 +1,9 @@
 -----BEGIN PKCS7-----
-MIIJDAYJKoZIhvcNAQcCoIII/TCCCPkCAQExADALBgkqhkiG9w0BBwGgggjfMIIF
-wTCCBKmgAwIBAgIJ+pQ4odKc8AABMA0GCSqGSIb3DQEBBQUAMGAxCzAJBgNVBAYT
+MIIJMwYJKoZIhvcNAQcCoIIJJDCCCSACAQExADALBgkqhkiG9w0BBwGgggkIMIIF
+ujCCBKKgAwIBAgIJ+pQ4odKc8AABMA0GCSqGSIb3DQEBCwUAMGAxCzAJBgNVBAYT
 AlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRIwEAYDVQQHEwlTYW4gTWF0ZW8xFzAV
-BgNVBAoTDkdlbml1cy5jb20gSW5jMQ8wDQYDVQQLEwZOZXRPcHMwHhcNMTQwMTI4
-MjE0MjE0WhcNMjQwMTI2MjE0MjE0WjBgMQswCQYDVQQGEwJVUzETMBEGA1UECBMK
+BgNVBAoTDkdlbml1cy5jb20gSW5jMQ8wDQYDVQQLEwZOZXRPcHMwHhcNMjQwMTI4
+MTEzNTEwWhcNMzQwMTI1MTEzNTEwWjBgMQswCQYDVQQGEwJVUzETMBEGA1UECBMK
 Q2FsaWZvcm5pYTESMBAGA1UEBxMJU2FuIE1hdGVvMRcwFQYDVQQKEw5HZW5pdXMu
 Y29tIEluYzEPMA0GA1UECxMGTmV0T3BzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
 MIIBCgKCAQEArfmkkDffJP6ODl13KnTaB8cwvB4anWw8+bGa8y9N7wPx7RWZWFMr
@@ -11,41 +11,42 @@
 K2CModRh8ir/qdhu0PG4SsXdyN8uT8H6bitmH4vpLaAMMi6aa1M6Ygio8a37UCQQ
 7fw2P7YVR61BsyqwsM/eYtgd2LqrObLwkkOvxTwpZPWDftHI4ucz1rgNnD9q0H3g
 kyGyGq9NBkBHJ25+CkMe+1q/eh4Xt2kt2ML4q5YZmQEwHm1eIR3/uGlb1+bueRMd
-hrueth/FsUiKPJ0gzmsxzQefgcLnctIx3wIDAQABo4ICfDCCAngwCQYDVR0TBAIw
-ADALBgNVHQ8EBAMCBeAwHQYDVR0OBBYEFJ/uU/wudzNDSI/SWkNNTXNLq2EIMIGS
-BgNVHSMEgYowgYeAFJ/uU/wudzNDSI/SWkNNTXNLq2EIoWSkYjBgMQswCQYDVQQG
-EwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTESMBAGA1UEBxMJU2FuIE1hdGVvMRcw
-FQYDVQQKEw5HZW5pdXMuY29tIEluYzEPMA0GA1UECxMGTmV0T3Bzggn6lDih0pzw
-AAEwHgYJYIZIAYb4QgENBBEWD1guNTA5IFVuaXQgVGVzdDCBwwYDVR0RBIG7MIG4
-oA4GAyoDBKAHDAV0ZXN0MYEQeDUwOUBleGFtcGxlLmNvbYIQeDUwOS5leGFtcGxl
-LmNvbaRQME4xCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1Bd2Vzb21lIER1ZGVzMRcw
-FQYDVQQLFA7DnGJlciBGcsOuZW5kczEOMAwGA1UEAxQF4oiGxpKGJWh0dHA6Ly93
-d3cuZXhhbXBsZS5jb20vP3E9YXdlc29tZW5lc3OHBMCoAAGIAyoDBDCBwwYDVR0S
-BIG7MIG4oA4GAyoDBKAHDAV0ZXN0MYEQeDUwOUBleGFtcGxlLmNvbYIQeDUwOS5l
-eGFtcGxlLmNvbaRQME4xCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1Bd2Vzb21lIER1
-ZGVzMRcwFQYDVQQLFA7DnGJlciBGcsOuZW5kczEOMAwGA1UEAxQF4oiGxpKGJWh0
-dHA6Ly93d3cuZXhhbXBsZS5jb20vP3E9YXdlc29tZW5lc3OHBMCoAAGIAyoDBDAN
-BgkqhkiG9w0BAQUFAAOCAQEAQK5jBzTq2lX1GpVD9RHxtTHJn/WkYOpMJYJruw8j
-HGfQwAkhlL9AqWgodTruoTnXgZbA7F3S8hx9gmUbHVjVeBvxZnGEJ8g7So1erFKv
-yQD1Ajtn7+uGXw6s0Dvde2ZVzV05pRk9ybg7kxKNXvVbKS3kyd6XoA27H5CSmzDu
-8cwHQkN4mJlwAiNCwMarpN4m4X0rQ+g1Ncfq+4sRjFLd8VVCbCpzD8UMBOVTpxxj
-kSyRPJZ7Db8SY0H2vcTUj2Yyog1RQ+RA/xp7Fgw+leEiveIE23Dq62hCHq6rU5Vj
-6L/LlLiKZ17lZT4z0fJ0lukPUpmVTynALKsKNm57+fOfnzCCAxYwggLWoAMCAQIC
-CQDcaK5WyhbztjAJBgcqhkjOOAQDMGAxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpD
-YWxpZm9ybmlhMRIwEAYDVQQHEwlTYW4gTWF0ZW8xFzAVBgNVBAoTDkdlbml1cy5j
-b20gSW5jMQ8wDQYDVQQLEwZOZXRPcHMwHhcNMTQwMTI4MjE0MjE1WhcNMTQwMjI3
-MjE0MjE1WjBgMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTESMBAG
-A1UEBxMJU2FuIE1hdGVvMRcwFQYDVQQKEw5HZW5pdXMuY29tIEluYzEPMA0GA1UE
-CxMGTmV0T3BzMIIBtzCCASsGByqGSM44BAEwggEeAoGBAIiv42coWuyVXpYoyEwf
-7uevd4ILhylFuvKH5tRWRcZENuxPOmXfr3L43PCdbnJhXMg3RkkWgjaE7lBk5evx
-LKH6rU2a1GnGmoY34OIvVvGL3xi96uYTTvLIX3+6NXaAlNppIBSHXcYx8cMdtYIn
-3J6JGSHEPo36ay4rDZbfS1frAhUAxF6k+/9T00QMolE41R+6ytzrawkCgYA4soyt
-rrIrQq6gwm2HanT8coIChr3/Et8rMamj7gS1yT9kH8HNGf217XtE3f/LUZZWUkBq
-3PNOuxhprNmvSAdQ7ZzhWfRvOFHKaH/DtKvLeEC5I00DfYSI64/V869Jy7lnyY7M
-h7ShLIwOlwnBDIL5oluircfXTr20a/Jv9pS1AAOBhQACgYEAhg6lELBZAIHVkjm7
-bwVJ5G/ka+KCjXxWXo+BCbqo0LqfrKQoQwUcwDzuKdqWxYbyUd0cl5/9fX59/RT/
-9ULklGy+dTyUSc/hj85PCXLYly3G6WECiN29TK0QLhEMZfi+iSm3YxNX3rxvmrHb
-bfO2SMef4r6ujv9KscDg0zQ4AgajGjAYMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgA3
-MAkGByqGSM44BAMDLwAwLAIUVcYZ1LNv22fDBiajZ99FpTn05SMCFCgMXzUGLdPy
-gY460q7tGpuydry+oQAxAA==
+hrueth/FsUiKPJ0gzmsxzQefgcLnctIx3wIDAQABo4ICdTCCAnEwCQYDVR0TBAIw
+ADALBgNVHQ8EBAMCBeAwHQYDVR0OBBYEFJ/uU/wudzNDSI/SWkNNTXNLq2EIMHoG
+A1UdIwRzMHGhZKRiMGAxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlh
+MRIwEAYDVQQHEwlTYW4gTWF0ZW8xFzAVBgNVBAoTDkdlbml1cy5jb20gSW5jMQ8w
+DQYDVQQLEwZOZXRPcHOCCfqUOKHSnPAAATAeBglghkgBhvhCAQ0EERYPWC41MDkg
+VW5pdCBUZXN0MIHMBgNVHREEgcQwgcGgDgYDKgMEoAcMBXRlc3QxgRB4NTA5QGV4
+YW1wbGUuY29tghB4NTA5LmV4YW1wbGUuY29tpFkwVzELMAkGA1UEBhMCVVMxFjAU
+BgNVBAoMDUF3ZXNvbWUgRHVkZXMxGzAZBgNVBAsMEsODwpxiZXIgRnLDg8KuZW5k
+czETMBEGA1UEAwwKw6LCiMKGw4bCkoYlaHR0cDovL3d3dy5leGFtcGxlLmNvbS8/
+cT1hd2Vzb21lbmVzc4cEwKgAAYgDKgMEMIHMBgNVHRIEgcQwgcGgDgYDKgMEoAcM
+BXRlc3QxgRB4NTA5QGV4YW1wbGUuY29tghB4NTA5LmV4YW1wbGUuY29tpFkwVzEL
+MAkGA1UEBhMCVVMxFjAUBgNVBAoMDUF3ZXNvbWUgRHVkZXMxGzAZBgNVBAsMEsOD
+wpxiZXIgRnLDg8KuZW5kczETMBEGA1UEAwwKw6LCiMKGw4bCkoYlaHR0cDovL3d3
+dy5leGFtcGxlLmNvbS8/cT1hd2Vzb21lbmVzc4cEwKgAAYgDKgMEMA0GCSqGSIb3
+DQEBCwUAA4IBAQCTGO2VOHe6AKVwF8eoULNAcpOkwrJXx1gXOvEgLeuO/3Yw4omp
+cf037nHP8RHToMmFbncnSbz3Cxj3ALVICfqv1fP4vZr41Rpr1Ga3sCZGkwhnppUR
+1m6fyfaFw328e4vYOiJE+IALNXwvvy9H49keH/JqiaQnw3jvHq/bUw1GluJMuqyF
+X1b492JqKJdke4wHKOxgPL2RyXsQbWKb258AP0VJ6WV5Nlezl91AtiyGoGxANtmk
+vh+hVjH3FLTiorODXvWc0HvFYS41A1Td8PPSAmGwhHffCLCUTpDWp/lxdGSw8gSy
+I9TCkgEwPcxe51m9zAqSw9NoxONT/9G5Xoo3MIIDRjCCAwKgAwIBAgIUE0RHw3SO
+k79XaON60QNnruEABj0wCwYJYIZIAWUDBAMCMGAxCzAJBgNVBAYTAlVTMRMwEQYD
+VQQIEwpDYWxpZm9ybmlhMRIwEAYDVQQHEwlTYW4gTWF0ZW8xFzAVBgNVBAoTDkdl
+bml1cy5jb20gSW5jMQ8wDQYDVQQLEwZOZXRPcHMwHhcNMjQwMTI4MTEzNTEwWhcN
+MjQwMjI3MTEzNTEwWjBgMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5p
+YTESMBAGA1UEBxMJU2FuIE1hdGVvMRcwFQYDVQQKEw5HZW5pdXMuY29tIEluYzEP
+MA0GA1UECxMGTmV0T3BzMIIBtzCCASsGByqGSM44BAEwggEeAoGBAIiv42coWuyV
+XpYoyEwf7uevd4ILhylFuvKH5tRWRcZENuxPOmXfr3L43PCdbnJhXMg3RkkWgjaE
+7lBk5evxLKH6rU2a1GnGmoY34OIvVvGL3xi96uYTTvLIX3+6NXaAlNppIBSHXcYx
+8cMdtYIn3J6JGSHEPo36ay4rDZbfS1frAhUAxF6k+/9T00QMolE41R+6ytzrawkC
+gYA4soytrrIrQq6gwm2HanT8coIChr3/Et8rMamj7gS1yT9kH8HNGf217XtE3f/L
+UZZWUkBq3PNOuxhprNmvSAdQ7ZzhWfRvOFHKaH/DtKvLeEC5I00DfYSI64/V869J
+y7lnyY7Mh7ShLIwOlwnBDIL5oluircfXTr20a/Jv9pS1AAOBhQACgYEAhg6lELBZ
+AIHVkjm7bwVJ5G/ka+KCjXxWXo+BCbqo0LqfrKQoQwUcwDzuKdqWxYbyUd0cl5/9
+fX59/RT/9ULklGy+dTyUSc/hj85PCXLYly3G6WECiN29TK0QLhEMZfi+iSm3YxNX
+3rxvmrHbbfO2SMef4r6ujv9KscDg0zQ4AgajOTA3MAkGA1UdEwQCMAAwCwYDVR0P
+BAQDAgA3MB0GA1UdDgQWBBSemsK6xsmGy5bDnP8vbb5aEAGsizALBglghkgBZQME
+AwIDMQAwLgIVALq7jp9gNAjfNthMXrtcG7FkIV7AAhUAwkzbnIRpiI5tqbJa/xrA
+PSTEej8xAA==
 -----END PKCS7-----
diff --git a/support/src/test/java/tests/resources/x509/crl-empty.der b/support/src/test/java/tests/resources/x509/crl-empty.der
index 8311f48..ad6ab5c 100644
--- a/support/src/test/java/tests/resources/x509/crl-empty.der
+++ b/support/src/test/java/tests/resources/x509/crl-empty.der
Binary files differ
diff --git a/support/src/test/java/tests/resources/x509/crl-rsa-dates.txt b/support/src/test/java/tests/resources/x509/crl-rsa-dates.txt
index 5cee7ef..d63e386 100644
--- a/support/src/test/java/tests/resources/x509/crl-rsa-dates.txt
+++ b/support/src/test/java/tests/resources/x509/crl-rsa-dates.txt
@@ -1,2 +1,2 @@
-lastUpdate=Jan 28 21:42:15 2014 GMT
-nextUpdate=Jan 31 19:42:15 2014 GMT
+lastUpdate=Jan 28 11:35:10 2024 GMT
+nextUpdate=Jan 31 09:35:10 2024 GMT
diff --git a/support/src/test/java/tests/resources/x509/crl-rsa-dsa-dates.txt b/support/src/test/java/tests/resources/x509/crl-rsa-dsa-dates.txt
index 026eaa5..5662906 100644
--- a/support/src/test/java/tests/resources/x509/crl-rsa-dsa-dates.txt
+++ b/support/src/test/java/tests/resources/x509/crl-rsa-dsa-dates.txt
@@ -1,2 +1,2 @@
-lastUpdate=Jan 28 21:42:16 2014 GMT
-nextUpdate=Feb 27 21:42:16 2014 GMT
+lastUpdate=Jan 28 11:35:10 2024 GMT
+nextUpdate=Feb 27 11:35:10 2024 GMT
diff --git a/support/src/test/java/tests/resources/x509/crl-rsa-dsa-sigopt.der b/support/src/test/java/tests/resources/x509/crl-rsa-dsa-sigopt.der
index e30a1d6..5616de8 100644
--- a/support/src/test/java/tests/resources/x509/crl-rsa-dsa-sigopt.der
+++ b/support/src/test/java/tests/resources/x509/crl-rsa-dsa-sigopt.der
Binary files differ
diff --git a/support/src/test/java/tests/resources/x509/crl-rsa-dsa-sigopt.pem b/support/src/test/java/tests/resources/x509/crl-rsa-dsa-sigopt.pem
index 139f79d..f1f3c1f 100644
--- a/support/src/test/java/tests/resources/x509/crl-rsa-dsa-sigopt.pem
+++ b/support/src/test/java/tests/resources/x509/crl-rsa-dsa-sigopt.pem
@@ -1,10 +1,11 @@
 -----BEGIN X509 CRL-----
-MIIBejCB3wIBATASBgkqhkiG9w0BAQowBaIDAgEBMGAxCzAJBgNVBAYTAlVTMRMw
+MIIBhTCB6gIBATASBgkqhkiG9w0BAQowBaIDAgEBMGAxCzAJBgNVBAYTAlVTMRMw
 EQYDVQQIEwpDYWxpZm9ybmlhMRIwEAYDVQQHEwlTYW4gTWF0ZW8xFzAVBgNVBAoT
-Dkdlbml1cy5jb20gSW5jMQ8wDQYDVQQLEwZOZXRPcHMXDTE0MDEyODIxNDIxNloX
-DTE0MDIyNzIxNDIxNlowRjAoAgkA3GiuVsoW87YXDTE0MDEyODIxNDIxNVowDDAK
-BgNVHRUEAwoBBTAaAgn6lDih0pzwAAEXDTE0MDEyODIxNDIxNVowEgYJKoZIhvcN
-AQEKMAWiAwIBAQOBgQARDZPj+o5Ap6hyQn5RYC7/SBIRyhQqY/CwpwsgOUDzJlkn
-3JYbylQ5etrZmspWNu+Yc+smIMEq+EIrsU/hkHNRT7Y3CBl4st4BRBMEIQWQF1qp
-XJ6vvv9wCAX30fDW0GhT/MJS5EW00GGIUAqxOQEZ6mqdAuqwj2z+uMyRvlhl4w==
+Dkdlbml1cy5jb20gSW5jMQ8wDQYDVQQLEwZOZXRPcHMXDTI0MDEyODExMzUxMVoX
+DTI0MDIyNzExMzUxMVowUTAaAgn6lDih0pzwAAEXDTI0MDEyODExMzUxMFowMwIU
+E0RHw3SOk79XaON60QNnruEABj0XDTI0MDEyODExMzUxMFowDDAKBgNVHRUEAwoB
+BTASBgkqhkiG9w0BAQowBaIDAgEBA4GBAK6unhFcroqGttOQA01H9YRz1pTfBUeZ
+NHN8blhUvnLpSoVWV0UJ0XI10cbD3w/3xi8ccLWfK08gHHlCxCL08PBtnMLO1cxT
+i3cuNWX8d9eXJJuAiPaEzRigPGpA1+h5klM4XRqiW+64lv/LskmPs9sElH6zvdWH
+P3tlD4rruLby
 -----END X509 CRL-----
diff --git a/support/src/test/java/tests/resources/x509/crl-rsa-dsa.der b/support/src/test/java/tests/resources/x509/crl-rsa-dsa.der
index 8e7f241..519c044fb 100644
--- a/support/src/test/java/tests/resources/x509/crl-rsa-dsa.der
+++ b/support/src/test/java/tests/resources/x509/crl-rsa-dsa.der
Binary files differ
diff --git a/support/src/test/java/tests/resources/x509/crl-rsa-sig.der b/support/src/test/java/tests/resources/x509/crl-rsa-sig.der
index 1cfb445..348e611 100644
--- a/support/src/test/java/tests/resources/x509/crl-rsa-sig.der
+++ b/support/src/test/java/tests/resources/x509/crl-rsa-sig.der
Binary files differ
diff --git a/support/src/test/java/tests/resources/x509/crl-rsa-tbs.der b/support/src/test/java/tests/resources/x509/crl-rsa-tbs.der
index 68e8e98..939ad5e 100644
--- a/support/src/test/java/tests/resources/x509/crl-rsa-tbs.der
+++ b/support/src/test/java/tests/resources/x509/crl-rsa-tbs.der
Binary files differ
diff --git a/support/src/test/java/tests/resources/x509/crl-rsa.der b/support/src/test/java/tests/resources/x509/crl-rsa.der
index 5eddb92..7d82d22 100644
--- a/support/src/test/java/tests/resources/x509/crl-rsa.der
+++ b/support/src/test/java/tests/resources/x509/crl-rsa.der
Binary files differ
diff --git a/support/src/test/java/tests/resources/x509/crl-unsupported.der b/support/src/test/java/tests/resources/x509/crl-unsupported.der
index 0636714..ef1ceae 100644
--- a/support/src/test/java/tests/resources/x509/crl-unsupported.der
+++ b/support/src/test/java/tests/resources/x509/crl-unsupported.der
Binary files differ