Mercurial > hg > release > icedtea6-1.2
changeset 876:4ec59f62f6ca
2008-05-26 Lillian Angel <langel@redhat.com>
* patches/icedtea-certbundle.patch: Added trustStore and
trustStoreType to props.
| author | Lillian Angel <langel@redhat.com> |
|---|---|
| date | Mon, 26 May 2008 09:11:58 -0400 |
| parents | ebc064e8892d |
| children | 8d050f3a935c |
| files | ChangeLog patches/icedtea-certbundle.patch |
| diffstat | 2 files changed, 15 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- 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 Lillian Angel <langel@redhat.com> + + * patches/icedtea-certbundle.patch: Added trustStore and + trustStoreType to props. + 2008-05-26 Mark Wielaard <mwielaard@redhat.com> * Makefile.am (ICEDTEA_PATCHES): Add
--- 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 @@ * 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(