|
 |
2d54fe |
# HG changeset patch
|
|
|
2d54fe |
# User andrew
|
|
|
2d54fe |
# Date 1525111445 -3600
|
|
|
2d54fe |
# Mon Apr 30 19:04:05 2018 +0100
|
|
|
2d54fe |
# Node ID 388fc8da23044317c160678ffa8ff541c216a255
|
|
|
2d54fe |
# Parent 556adf3a76aa81bf3918d7d46554dae7cc1d5c5c
|
|
|
2d54fe |
PR3575: System cacerts database handling should not affect jssecacerts
|
|
|
2d54fe |
|
|
|
2d54fe |
diff --git openjdk.orig/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java openjdk/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
|
|
|
2d54fe |
--- openjdk.orig/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
|
|
|
2d54fe |
+++ openjdk/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
|
|
|
2d54fe |
@@ -162,7 +162,7 @@
|
|
|
2d54fe |
* Try:
|
|
|
2d54fe |
* javax.net.ssl.trustStore (if this variable exists, stop)
|
|
|
2d54fe |
* jssecacerts
|
|
|
2d54fe |
- * cacerts
|
|
|
2d54fe |
+ * cacerts (system and local)
|
|
|
2d54fe |
*
|
|
|
2d54fe |
* If none exists, we use an empty keystore.
|
|
|
2d54fe |
*/
|
|
|
2d54fe |
@@ -174,14 +174,14 @@
|
|
|
2d54fe |
storeFile = new File(storeFileName);
|
|
|
2d54fe |
fis = getFileInputStream(storeFile);
|
|
|
2d54fe |
} else {
|
|
|
2d54fe |
- /* Check system cacerts DB first; /etc/pki/java/cacerts */
|
|
|
2d54fe |
- storeFile = new File(sep + "etc" + sep + "pki" + sep
|
|
|
2d54fe |
- + "java" + sep + "cacerts");
|
|
|
2d54fe |
+ String javaHome = props.get("javaHome");
|
|
|
2d54fe |
+ storeFile = new File(javaHome + sep + "lib" + sep
|
|
|
2d54fe |
+ + "security" + sep +
|
|
|
2d54fe |
+ "jssecacerts");
|
|
|
2d54fe |
if ((fis = getFileInputStream(storeFile)) == null) {
|
|
|
2d54fe |
- String javaHome = props.get("javaHome");
|
|
|
2d54fe |
- storeFile = new File(javaHome + sep + "lib" + sep
|
|
|
2d54fe |
- + "security" + sep +
|
|
|
2d54fe |
- "jssecacerts");
|
|
|
2d54fe |
+ /* Check system cacerts DB first; /etc/pki/java/cacerts */
|
|
|
2d54fe |
+ storeFile = new File(sep + "etc" + sep + "pki" + sep
|
|
|
2d54fe |
+ + "java" + sep + "cacerts");
|
|
|
2d54fe |
if ((fis = getFileInputStream(storeFile)) == null) {
|
|
|
2d54fe |
storeFile = new File(javaHome + sep + "lib" + sep
|
|
|
2d54fe |
+ "security" + sep +
|