Mercurial > hg > icedtea8-forest > jdk
changeset 13339:388fc8da2304 icedtea-3.8.0pre02
PR3575: System cacerts database handling should not affect jssecacerts
| author | andrew |
|---|---|
| date | Mon, 30 Apr 2018 19:04:05 +0100 |
| parents | 556adf3a76aa |
| children | 9c9ff65b03b6 |
| files | src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java |
| diffstat | 1 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java Mon Feb 12 08:56:44 2018 -0800 +++ b/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java Mon Apr 30 19:04:05 2018 +0100 @@ -162,7 +162,7 @@ * Try: * javax.net.ssl.trustStore (if this variable exists, stop) * jssecacerts - * cacerts + * cacerts (system and local) * * If none exists, we use an empty keystore. */ @@ -174,14 +174,14 @@ storeFile = new File(storeFileName); fis = getFileInputStream(storeFile); } else { - /* Check system cacerts DB first; /etc/pki/java/cacerts */ - storeFile = new File(sep + "etc" + sep + "pki" + sep - + "java" + sep + "cacerts"); + String javaHome = props.get("javaHome"); + storeFile = new File(javaHome + sep + "lib" + sep + + "security" + sep + + "jssecacerts"); if ((fis = getFileInputStream(storeFile)) == null) { - String javaHome = props.get("javaHome"); - storeFile = new File(javaHome + sep + "lib" + sep - + "security" + sep + - "jssecacerts"); + /* Check system cacerts DB first; /etc/pki/java/cacerts */ + storeFile = new File(sep + "etc" + sep + "pki" + sep + + "java" + sep + "cacerts"); if ((fis = getFileInputStream(storeFile)) == null) { storeFile = new File(javaHome + sep + "lib" + sep + "security" + sep +