8222089: [TESTBUG] sun/security/lib/cacerts/VerifyCACerts.java fails due to cert within 90-day expiry window

Reviewed-by: xuelei
This commit is contained in:
Sean Mullan 2019-04-08 12:19:51 -04:00
parent 0974861dd8
commit 1e6d8fbb1d

View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -25,7 +25,7 @@
/** /**
* @test * @test
* @bug 8189131 8198240 8191844 8189949 8191031 8196141 8204923 8195774 8199779 * @bug 8189131 8198240 8191844 8189949 8191031 8196141 8204923 8195774 8199779
* 8209452 8209506 8210432 8195793 * 8209452 8209506 8210432 8195793 8222089
* @summary Check root CA entries in cacerts file * @summary Check root CA entries in cacerts file
*/ */
import java.io.File; import java.io.File;
@ -237,7 +237,12 @@ public class VerifyCACerts {
// Exception list to 90 days expiry policy // Exception list to 90 days expiry policy
// No error will be reported if certificate in this list expires // No error will be reported if certificate in this list expires
private static final HashSet<String> EXPIRY_EXC_ENTRIES = new HashSet<>(); private static final HashSet<String> EXPIRY_EXC_ENTRIES = new HashSet<>() {
{
add("certplusclass2primaryca [jdk]");
add("certplusclass3pprimaryca [jdk]");
}
};
// Ninety days in milliseconds // Ninety days in milliseconds
private static final long NINETY_DAYS = 7776000000L; private static final long NINETY_DAYS = 7776000000L;