Mercurial > hg > release > icedtea6-1.13

view patches/pr2890-system_cacerts.patch @ 3245:17669a12c966

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
New backports for issues to be fixed in 1.13.11. S6863746, PR2951: javap should not scan ct.sym by default S8071705, PR2820, RH1182694: Java application menu misbehaves when running multiple screen stacked vertically S8150954, PR2868, RH1176206: AWT Robot not compatible with GNOME Shell PR2890: OpenJDK should check for system cacerts database (e.g. /etc/pki/java/cacerts) 2016-05-03 Andrew John Hughes <gnu.andrew@member.fsf.org> * Makefile.am: (ICEDTEA_PATCHES): Add new patches. * NEWS: Updated. * patches/openjdk/6307603-xrender-01.patch: Regenerated after application of 8150954 / PR2868. * patches/openjdk/6863746-pr2951-no_ct.sym_in_javap.patch, * patches/openjdk/8071705-pr2820-menu_misbehaviour.patch, * patches/openjdk/8150954-pr2868-composite_desktop.patch, * patches/pr2890-system_cacerts.patch: New backports for issues to be fixed in 1.13.11.
author Andrew John Hughes <gnu.andrew@redhat.com>
date Wed, 04 May 2016 02:51:07 +0100
parents
children
line wrap: on
line source

# HG changeset patch
# User andrew
# Date 1460692925 -3600
#      Fri Apr 15 05:02:05 2016 +0100
# Node ID 3fc5cbcd46dd9ac3c7a8eae4758e067eb701d129
# Parent  a8a1f3433cf6221d727d500514d6ec593ad7ac9c
PR2890: OpenJDK should check for system cacerts database (e.g. /etc/pki/java/cacerts)

diff -r a8a1f3433cf6 -r 3fc5cbcd46dd src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
--- openjdk/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java	Wed Mar 23 23:46:58 2016 +0000
+++ openjdk/jdk/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);
+                    }
                 }
             }