You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by bi...@apache.org on 2003/10/06 01:43:47 UTC
cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/jsse JSSESocketFactory.java
billbarker 2003/10/05 16:43:47
Modified: util/java/org/apache/tomcat/util/net/jsse
JSSESocketFactory.java
Log:
Make the TrustStore a configurable option (so different Hosts can have different TrustStores).
Revision Changes Path
1.10 +8 -3 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
Index: JSSESocketFactory.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- JSSESocketFactory.java 2 Sep 2003 21:34:38 -0000 1.9
+++ JSSESocketFactory.java 5 Oct 2003 23:43:47 -0000 1.10
@@ -265,9 +265,14 @@
protected KeyStore getTrustStore(String keystoreType) throws IOException {
KeyStore trustStore = null;
- String trustStoreFile = System.getProperty("javax.net.ssl.trustStore");
- String trustStorePassword =
- System.getProperty("javax.net.ssl.trustStorePassword");
+ String trustStoreFile = (String)attributes.get("truststoreFile");
+ if(trustStoreFile == null) {
+ trustStoreFile = System.getProperty("javax.net.ssl.trustStore");
+ }
+ String trustStorePassword = (String)attributes.get("truststorePass");
+ if( trustStorePassword == null) {
+ trustStorePassword = System.getProperty("javax.net.ssl.trustStorePassword");
+ }
if (trustStoreFile != null && trustStorePassword != null){
trustStore = getStore(keystoreType, trustStoreFile,
trustStorePassword);
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org