Mercurial > hg > icedtea7-forest > jdk

changeset 8758:3fc5cbcd46dd icedtea-2.7.0pre05

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
PR2889: OpenJDK should check for system cacerts database (e.g. /etc/pki/java/cacerts)
author andrew
date Fri, 15 Apr 2016 05:02:05 +0100
parents a8a1f3433cf6
children 8477a30c1924
files src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
diffstat 1 files changed, 12 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java	Wed Mar 23 23:46:58 2016 +0000
+++ b/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java	Fri Apr 15 05:02:05 2016 +0100
@@ -170,15 +170,20 @@
                 storeFile = new File(storeFileName);
                 fis = getFileInputStream(storeFile);
             } else {
-                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) {
+                    String javaHome = props.get("javaHome");
                     storeFile = new File(javaHome + sep + "lib" + sep
-                                                + "security" + sep +
-                                                "cacerts");
-                    fis = getFileInputStream(storeFile);
+                                         + "security" + sep +
+                                         "jssecacerts");
+                    if ((fis = getFileInputStream(storeFile)) == null) {
+                        storeFile = new File(javaHome + sep + "lib" + sep
+                                             + "security" + sep +
+                                             "cacerts");
+                        fis = getFileInputStream(storeFile);
+                    }
                 }
             }