archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 14:54:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8341059: Change Entrust TLS distrust date to November 12, 2024

Browse source 
Reviewed-by: mullan
This commit is contained in:
Rajan Halade 2024-09-27 17:16:13 +00:00
parent 65200a9589
commit f554c3ffce
4 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/java.base/share/classes/sun/security/validator/CADistrustPolicy.java
View file

@ -57,7 +57,7 @@ enum CADistrustPolicy {
/** /**
* Distrust TLS Server certificates anchored by an Entrust root CA and * Distrust TLS Server certificates anchored by an Entrust root CA and
* issued after October 31, 2024. If enabled, this policy is currently * issued after November 11, 2024. If enabled, this policy is currently
* enforced by the PKIX and SunX509 TrustManager implementations * enforced by the PKIX and SunX509 TrustManager implementations
* of the SunJSSE provider implementation. * of the SunJSSE provider implementation.
*/ */

8
src/java.base/share/classes/sun/security/validator/EntrustTLSPolicy.java
View file

@ -88,8 +88,8 @@ final class EntrustTLSPolicy {
// Any TLS Server certificate that is anchored by one of the Entrust // Any TLS Server certificate that is anchored by one of the Entrust
// roots above and is issued after this date will be distrusted. // roots above and is issued after this date will be distrusted.
private static final LocalDate OCTOBER_31_2024 = private static final LocalDate NOVEMBER_11_2024 =
LocalDate.of(2024, Month.OCTOBER, 31); LocalDate.of(2024, Month.NOVEMBER, 11);
/** /**
* This method assumes the eeCert is a TLS Server Cert and chains back to * This method assumes the eeCert is a TLS Server Cert and chains back to
@ -111,8 +111,8 @@ final class EntrustTLSPolicy {
Date notBefore = chain[0].getNotBefore(); Date notBefore = chain[0].getNotBefore();
LocalDate ldNotBefore = LocalDate.ofInstant(notBefore.toInstant(), LocalDate ldNotBefore = LocalDate.ofInstant(notBefore.toInstant(),
ZoneOffset.UTC); ZoneOffset.UTC);
// reject if certificate is issued after October 31, 2024 // reject if certificate is issued after November 11, 2024
checkNotBefore(ldNotBefore, OCTOBER_31_2024, anchor); checkNotBefore(ldNotBefore, NOVEMBER_11_2024, anchor);
} }
} }

2
src/java.base/share/conf/security/java.security
View file

@ -1358,7 +1358,7 @@ jdk.sasl.disabledMechanisms=
# Distrust after December 31, 2019. # Distrust after December 31, 2019.
# #
# ENTRUST_TLS : Distrust TLS Server certificates anchored by # ENTRUST_TLS : Distrust TLS Server certificates anchored by
# an Entrust root CA and issued after October 31, 2024. # an Entrust root CA and issued after November 11, 2024.
# #
# Leading and trailing whitespace surrounding each value are ignored. # Leading and trailing whitespace surrounding each value are ignored.
# Unknown values are ignored. If the property is commented out or set to the # Unknown values are ignored. If the property is commented out or set to the

4
test/jdk/sun/security/ssl/X509TrustManagerImpl/distrust/Entrust.java
View file

@ -28,7 +28,7 @@ import javax.net.ssl.*;
/** /**
* @test * @test
* @bug 8337664 * @bug 8337664 8341059
* @summary Check that TLS Server certificates chaining back to distrusted * @summary Check that TLS Server certificates chaining back to distrusted
* Entrust roots are invalid * Entrust roots are invalid
* @library /test/lib * @library /test/lib
@ -52,7 +52,7 @@ public class Entrust {
// Date when the restrictions take effect // Date when the restrictions take effect
private static final ZonedDateTime DISTRUST_DATE = private static final ZonedDateTime DISTRUST_DATE =
LocalDate.of(2024, 11, 1).atStartOfDay(ZoneOffset.UTC); LocalDate.of(2024, 11, 12).atStartOfDay(ZoneOffset.UTC);
public static void main(String[] args) throws Exception { public static void main(String[] args) throws Exception {
Distrust distrust = new Distrust(args); Distrust distrust = new Distrust(args);