Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43094

Support any keystoreType that doesn't need a file.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@653128 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java b/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
index 3928fbc..9538edb 100644 (file)
--- a/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
+++ b/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
@@ -310,7 +310,7 @@ public class JSSESocketFactory
         InputStream istream = null;
         try {
             ks = KeyStore.getInstance(type);
-            if(! "PKCS11".equalsIgnoreCase(type) ) {
+            if(!("PKCS11".equalsIgnoreCase(type) || "".equalsIgnoreCase(path))) {
                 File keyStoreFile = new File(path);
                 if (!keyStoreFile.isAbsolute()) {
                     keyStoreFile = new File(System.getProperty("catalina.base"),

diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml
index 1dba1fd..5445967 100644 (file)
--- a/webapps/docs/config/http.xml
+++ b/webapps/docs/config/http.xml
@@ -655,7 +655,9 @@
       <p>The pathname of the keystore file where you have stored the
       server certificate to be loaded.  By default, the pathname is
       the file "<code>.keystore</code>" in the operating system home
-      directory of the user that is running Tomcat.</p>
+      directory of the user that is running Tomcat. If your
+      <code>keystoreType</code> doesn't need a file use <code>""</code>
+      (empty string) for this parameter.</p>
     </attribute>
 
     <attribute name="keystorePass" required="false">