Author: jfclere
Date: Mon Aug 18 16:14:30 2014
New Revision: 1618650
URL: http://svn.apache.org/r1618650
Log:
Allow to use MS Windows keystore.
submitted by ehsavoie (Emmanuel Hugonnet <[email protected]>).
Modified:
tomcat/trunk/build.properties.default
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
Modified: tomcat/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1618650&r1=1618649&r2=1618650&view=diff
==============================================================================
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Mon Aug 18 16:14:30 2014
@@ -238,3 +238,4 @@ cobertura.loc=${base-sf.loc}/cobertura/c
# ----- JVM settings for unit tests
java.net.preferIPv4Stack=false
+test.entry=org.apache.tomcat.util.net.TestSsl
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java?rev=1618650&r1=1618649&r2=1618650&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
Mon Aug 18 16:14:30 2014
@@ -295,6 +295,8 @@ public class JSSESocketFactory implement
String keystoreFile = endpoint.getKeystoreFile();
if (keystoreFile == null)
keystoreFile = defaultKeystoreFile;
+ if("Windows-MY".equals(type))
+ keystoreFile = "";
return getStore(type, provider, keystoreFile, pass);
}
@@ -310,6 +312,8 @@ public class JSSESocketFactory implement
if(truststoreFile == null) {
truststoreFile = System.getProperty("javax.net.ssl.trustStore");
}
+ if("Windows-ROOT".equals(keystoreType))
+ truststoreFile = "";
if(log.isDebugEnabled()) {
log.debug("Truststore = " + truststoreFile);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
