|
 |
cdbd41 |
# HG changeset patch
|
|
|
cdbd41 |
# User andrew
|
|
|
cdbd41 |
# Date 1459487045 -3600
|
|
|
cdbd41 |
# Fri Apr 01 06:04:05 2016 +0100
|
|
|
cdbd41 |
# Node ID 3334efeacd8327a14b7d2f392f4546e3c29c594b
|
|
|
cdbd41 |
# Parent 6b81fd2227d14226f2121f2d51b464536925686e
|
|
|
cdbd41 |
PR2888: OpenJDK should check for system cacerts database (e.g. /etc/pki/java/cacerts)
|
|
|
cdbd41 |
PR3575: System cacerts database handling should not affect jssecacerts
|
|
|
cdbd41 |
|
|
|
cdbd41 |
diff --git openjdk.orig/jdk/src/share/classes/sun/security/ssl/TrustStoreManager.java openjdk/jdk/src/share/classes/sun/security/ssl/TrustStoreManager.java
|
|
|
cdbd41 |
--- openjdk.orig/jdk/src/share/classes/sun/security/ssl/TrustStoreManager.java
|
|
|
cdbd41 |
+++ openjdk/jdk/src/share/classes/sun/security/ssl/TrustStoreManager.java
|
|
|
cdbd41 |
@@ -72,7 +72,7 @@
|
|
|
cdbd41 |
* The preference of the default trusted KeyStore is:
|
|
|
cdbd41 |
* javax.net.ssl.trustStore
|
|
|
cdbd41 |
* jssecacerts
|
|
|
cdbd41 |
- * cacerts
|
|
|
cdbd41 |
+ * cacerts (system and local)
|
|
|
cdbd41 |
*/
|
|
|
cdbd41 |
private static final class TrustStoreDescriptor {
|
|
|
cdbd41 |
private static final String fileSep = File.separator;
|
|
|
cdbd41 |
@@ -83,6 +83,10 @@
|
|
|
cdbd41 |
defaultStorePath + fileSep + "cacerts";
|
|
|
cdbd41 |
private static final String jsseDefaultStore =
|
|
|
cdbd41 |
defaultStorePath + fileSep + "jssecacerts";
|
|
|
cdbd41 |
+ /* Check system cacerts DB: /etc/pki/java/cacerts */
|
|
|
cdbd41 |
+ private static final String systemStore =
|
|
|
cdbd41 |
+ fileSep + "etc" + fileSep + "pki" +
|
|
|
cdbd41 |
+ fileSep + "java" + fileSep + "cacerts";
|
|
|
cdbd41 |
|
|
|
cdbd41 |
// the trust store name
|
|
|
cdbd41 |
private final String storeName;
|
|
|
cdbd41 |
@@ -146,7 +150,8 @@
|
|
|
cdbd41 |
long temporaryTime = 0L;
|
|
|
cdbd41 |
if (!"NONE".equals(storePropName)) {
|
|
|
cdbd41 |
String[] fileNames =
|
|
|
cdbd41 |
- new String[] {storePropName, defaultStore};
|
|
|
cdbd41 |
+ new String[] {storePropName,
|
|
|
cdbd41 |
+ systemStore, defaultStore};
|
|
|
cdbd41 |
for (String fileName : fileNames) {
|
|
|
cdbd41 |
File f = new File(fileName);
|
|
|
cdbd41 |
if (f.isFile() && f.canRead()) {
|
|
|
cdbd41 |
diff --git openjdk.orig/jdk/src/share/classes/sun/security/tools/KeyStoreUtil.java openjdk/jdk/src/share/classes/sun/security/tools/KeyStoreUtil.java
|
|
|
cdbd41 |
--- openjdk.orig/jdk/src/share/classes/sun/security/tools/KeyStoreUtil.java
|
|
|
cdbd41 |
+++ openjdk/jdk/src/share/classes/sun/security/tools/KeyStoreUtil.java
|
|
|
cdbd41 |
@@ -108,9 +108,14 @@
|
|
|
cdbd41 |
throws Exception
|
|
|
cdbd41 |
{
|
|
|
cdbd41 |
String sep = File.separator;
|
|
|
cdbd41 |
- File file = new File(System.getProperty("java.home") + sep
|
|
|
cdbd41 |
- + "lib" + sep + "security" + sep
|
|
|
cdbd41 |
- + "cacerts");
|
|
|
cdbd41 |
+ /* Check system cacerts DB first; /etc/pki/java/cacerts */
|
|
|
cdbd41 |
+ File file = new File(sep + "etc" + sep + "pki" + sep
|
|
|
cdbd41 |
+ + "java" + sep + "cacerts");
|
|
|
cdbd41 |
+ if (!file.exists()) {
|
|
|
cdbd41 |
+ file = new File(System.getProperty("java.home") + sep
|
|
|
cdbd41 |
+ + "lib" + sep + "security" + sep
|
|
|
cdbd41 |
+ + "cacerts");
|
|
|
cdbd41 |
+ }
|
|
|
cdbd41 |
if (!file.exists()) {
|
|
|
cdbd41 |
return null;
|
|
|
cdbd41 |
}
|