Blame SOURCES/pr3575-rh1567204.patch

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