ASF Bugzilla – Attachment 24845 Details for
Bug 48545
truststorePass used in JSSESocketFactory should be optional (nillable)
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patched JSSESocketFactory.java based on Tomcat 6.0.20
JSSESocketFactory.diff (text/plain), 2.24 KB, created by
smmwpf54
on 2010-01-14 07:58:48 UTC
(
hide
)
Description:
Patched JSSESocketFactory.java based on Tomcat 6.0.20
Filename:
MIME Type:
Creator:
smmwpf54
Created:
2010-01-14 07:58:48 UTC
Size:
2.24 KB
patch
obsolete
>*** JSSESocketFactory.java 2010-01-14 14:38:04.000000000 +0100 >--- JSSESocketFactory.java.orig 2009-05-14 01:15:00.000000000 +0200 >*************** >*** 281,289 **** > if( truststorePassword == null) { > truststorePassword = System.getProperty("javax.net.ssl.trustStorePassword"); > } >! /* if( truststorePassword == null ) { > truststorePassword = getKeystorePassword(); >! } msp 14.1.10 */ > if(log.isDebugEnabled()) { > log.debug("TrustPass = " + truststorePassword); > } >--- 281,289 ---- > if( truststorePassword == null) { > truststorePassword = System.getProperty("javax.net.ssl.trustStorePassword"); > } >! if( truststorePassword == null ) { > truststorePassword = getKeystorePassword(); >! } > if(log.isDebugEnabled()) { > log.debug("TrustPass = " + truststorePassword); > } >*************** >*** 310,316 **** > log.debug("trustProvider = " + truststoreProvider); > } > >! if (truststoreFile != null /* && truststorePassword != null msp 14.1.10 */){ > trustStore = getStore(truststoreType, truststoreProvider, > truststoreFile, truststorePassword); > } >--- 310,316 ---- > log.debug("trustProvider = " + truststoreProvider); > } > >! if (truststoreFile != null && truststorePassword != null){ > trustStore = getStore(truststoreType, truststoreProvider, > truststoreFile, truststorePassword); > } >*************** >*** 341,347 **** > istream = new FileInputStream(keyStoreFile); > } > >! ks.load(istream, pass != null ? pass.toCharArray() : null); > } catch (FileNotFoundException fnfe) { > log.error(sm.getString("jsse.keystore_load_failed", type, path, > fnfe.getMessage()), fnfe); >--- 341,347 ---- > istream = new FileInputStream(keyStoreFile); > } > >! ks.load(istream, pass.toCharArray()); > } catch (FileNotFoundException fnfe) { > log.error(sm.getString("jsse.keystore_load_failed", type, path, > fnfe.getMessage()), fnfe);
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 48545
:
24845
|
25848
|
26268