changeset in /hg/icedtea6: 2008-05-26 Lillian Angel <langel at re...

[Lillian Angel]

changeset 4ec59f62f6ca in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=4ec59f62f6ca
description:
	2008-05-26  Lillian Angel  <langel at redhat.com>

	        * patches/icedtea-certbundle.patch: Added trustStore and
	        trustStoreType to props.

diffstat:

2 files changed, 15 insertions(+), 10 deletions(-)
ChangeLog                        |    5 +++++
patches/icedtea-certbundle.patch |   20 ++++++++++----------

diffs (43 lines):

diff -r ebc064e8892d -r 4ec59f62f6ca ChangeLog
--- a/ChangeLog	Mon May 26 11:29:25 2008 +0200
+++ b/ChangeLog	Mon May 26 09:11:58 2008 -0400
@@ -1,3 +1,8 @@ 2008-05-26  Mark Wielaard  <mwielaard at re
+2008-05-26  Lillian Angel  <langel at redhat.com>
+
+	* patches/icedtea-certbundle.patch: Added trustStore and
+	trustStoreType to props.
+
 2008-05-26  Mark Wielaard  <mwielaard at redhat.com>
 
 	* Makefile.am (ICEDTEA_PATCHES): Add
diff -r ebc064e8892d -r 4ec59f62f6ca patches/icedtea-certbundle.patch
--- a/patches/icedtea-certbundle.patch	Mon May 26 11:29:25 2008 +0200
+++ b/patches/icedtea-certbundle.patch	Mon May 26 09:11:58 2008 -0400
@@ -213,17 +213,17 @@ diff -urN openjdk.orig/jdk/src/share/cla
           * Policy
 --- openjdkold/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java	2008-03-26 04:59:04.000000000 -0400
 +++ openjdk/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java	2008-05-08 10:49:22.000000000 -0400
-@@ -140,18 +140,18 @@
- 
-         AccessController.doPrivileged(new PrivilegedExceptionAction<Void>() {
+@@ -142,16 +142,21 @@
              public Void run() throws Exception {
--                props.put("trustStore", System.getProperty(
--                                "javax.net.ssl.trustStore"));
-                 props.put("javaHome", System.getProperty(
-                                         "java.home"));
--                props.put("trustStoreType", System.getProperty(
--                                "javax.net.ssl.trustStoreType",
--                                KeyStore.getDefaultType()));
+                 props.put("trustStore", System.getProperty(
+                                 "javax.net.ssl.trustStore"));
+-                props.put("javaHome", System.getProperty(
+-                                        "java.home"));
+                 props.put("trustStoreType", System.getProperty(
+                                 "javax.net.ssl.trustStoreType",
+                                 KeyStore.getDefaultType()));
++		props.put("javaHome", System.getProperty(
++                                        "java.home"));
                  props.put("trustStoreProvider", System.getProperty(
                                  "javax.net.ssl.trustStoreProvider", ""));
                  props.put("trustStorePasswd", System.getProperty(