Blame pr3575-rh1567204-system_cacerts_database_handling_no_longer_affect_jssecacerts.patch

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