stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8209452: VerifyCACerts.java failed with "At least one cacert test failed"

Browse Source 
Allow test to pass even if cert in EXPIRY_EXC_ENTRIES expires

Reviewed-by: mullan
This commit is contained in:
Rajan Halade 2018-08-14 09:38:29 -07:00
parent afa5d318d3
commit 732e3f5416
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/jdk/lib/security/cacerts/VerifyCACerts.java
View File

@ -24,7 +24,7 @@
/**
* @test
* @bug 8189131 8198240 8191844 8189949 8191031 8196141 8204923 8195774 8199779
* @bug 8189131 8198240 8191844 8189949 8191031 8196141 8204923 8195774 8199779 8209452
* @summary Check root CA entries in cacerts file
*/
import java.io.File;
@ -231,6 +231,7 @@ public class VerifyCACerts {
};
// Exception list to 90 days expiry policy
// No error will be reported if certificate in this list expires
private static final HashSet<String> EXPIRY_EXC_ENTRIES
= new HashSet<String>(Arrays.asList(
"gtecybertrustglobalca [jdk]"
@ -293,8 +294,10 @@ public class VerifyCACerts {
try {
cert.checkValidity();
} catch (CertificateExpiredException cee) {
atLeastOneFailed = true;
System.err.println("ERROR: cert is expired");
if (!EXPIRY_EXC_ENTRIES.contains(alias)) {
atLeastOneFailed = true;
System.err.println("ERROR: cert is expired");
}
} catch (CertificateNotYetValidException cne) {
atLeastOneFailed = true;
System.err.println("ERROR: cert is not yet valid");