archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8244148: keytool -printcert and -printcrl should support the -trustcacerts and -keystore options

Browse source 
Reviewed-by: weijun, jjiang
This commit is contained in:
Hai-May Chao 2020-06-23 16:30:38 +08:00
parent 8d9826e4d1
commit e3eb38f4d2
12 changed files with 459 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/java.base/share/classes/sun/security/util/AnchorCertificates.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -36,7 +36,6 @@ import java.util.Enumeration;
import java.util.HashSet;
import java.util.Set;
import jdk.internal.util.StaticProperty;
import sun.security.x509.X509CertImpl;
/**
@ -53,10 +52,9 @@ public class AnchorCertificates {
AccessController.doPrivileged(new PrivilegedAction<Void>() {
@Override
public Void run() {
File f = new File(StaticProperty.javaHome(),
"lib/security/cacerts");
KeyStore cacerts;
File f = new File(FilePaths.cacerts());
try {
KeyStore cacerts;
cacerts = KeyStore.getInstance("JKS");
try (FileInputStream fis = new FileInputStream(f)) {
cacerts.load(fis, null);