Skip to content

Commit f554c3f

Browse files
committedSep 27, 2024
8341059: Change Entrust TLS distrust date to November 12, 2024
Reviewed-by: mullan
1 parent 65200a9 commit f554c3f

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed
 

‎src/java.base/share/classes/sun/security/validator/CADistrustPolicy.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ void checkDistrust(String variant, X509Certificate[] chain)
5757

5858
/**
5959
* Distrust TLS Server certificates anchored by an Entrust root CA and
60-
* issued after October 31, 2024. If enabled, this policy is currently
60+
* issued after November 11, 2024. If enabled, this policy is currently
6161
* enforced by the PKIX and SunX509 TrustManager implementations
6262
* of the SunJSSE provider implementation.
6363
*/

‎src/java.base/share/classes/sun/security/validator/EntrustTLSPolicy.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ final class EntrustTLSPolicy {
8888

8989
// Any TLS Server certificate that is anchored by one of the Entrust
9090
// roots above and is issued after this date will be distrusted.
91-
private static final LocalDate OCTOBER_31_2024 =
92-
LocalDate.of(2024, Month.OCTOBER, 31);
91+
private static final LocalDate NOVEMBER_11_2024 =
92+
LocalDate.of(2024, Month.NOVEMBER, 11);
9393

9494
/**
9595
* This method assumes the eeCert is a TLS Server Cert and chains back to
@@ -111,8 +111,8 @@ static void checkDistrust(X509Certificate[] chain)
111111
Date notBefore = chain[0].getNotBefore();
112112
LocalDate ldNotBefore = LocalDate.ofInstant(notBefore.toInstant(),
113113
ZoneOffset.UTC);
114-
// reject if certificate is issued after October 31, 2024
115-
checkNotBefore(ldNotBefore, OCTOBER_31_2024, anchor);
114+
// reject if certificate is issued after November 11, 2024
115+
checkNotBefore(ldNotBefore, NOVEMBER_11_2024, anchor);
116116
}
117117
}
118118

‎src/java.base/share/conf/security/java.security

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

‎test/jdk/sun/security/ssl/X509TrustManagerImpl/distrust/Entrust.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
/**
3030
* @test
31-
* @bug 8337664
31+
* @bug 8337664 8341059
3232
* @summary Check that TLS Server certificates chaining back to distrusted
3333
* Entrust roots are invalid
3434
* @library /test/lib
@@ -52,7 +52,7 @@ public class Entrust {
5252

5353
// Date when the restrictions take effect
5454
private static final ZonedDateTime DISTRUST_DATE =
55-
LocalDate.of(2024, 11, 1).atStartOfDay(ZoneOffset.UTC);
55+
LocalDate.of(2024, 11, 12).atStartOfDay(ZoneOffset.UTC);
5656

5757
public static void main(String[] args) throws Exception {
5858
Distrust distrust = new Distrust(args);

0 commit comments

Comments
 (0)
Please sign in to comment.