Author: jfclere
Date: Mon Nov 9 10:20:32 2015
New Revision: 1713365
URL: http://svn.apache.org/viewvc?rev=1713365&view=rev
Log:
Use the default when not explicitly configured.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java?rev=1713365&r1=1713364&r2=1713365&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
Mon Nov 9 10:20:32 2015
@@ -443,7 +443,11 @@ public class OpenSSLContext implements o
KeyStore ks = KeyStore.getInstance(keystoretype);
InputStream stream = ConfigFileLoader.getInputStream(keystorefile);
ks.load(stream, password.toCharArray());
- KeyManagerFactory kmf =
KeyManagerFactory.getInstance(keystoreprovider);
+ KeyManagerFactory kmf;
+ if (keystoreprovider != null)
+ kmf = KeyManagerFactory.getInstance(keystoreprovider);
+ else
+ kmf =
KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
kmf.init(ks, password.toCharArray());
KeyManager[] kms = kmf.getKeyManagers();
if (kms == null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
