Author: markt
Date: Thu Jul 14 20:52:40 2016
New Revision: 1752745
URL: http://svn.apache.org/viewvc?rev=1752745&view=rev
Log:
Correct a regression in refactoring to enable injection of custom keystores
that broke the automatic conversion of OpenSSL style PEM key and certificate
files for use with JSSE TLS connectors.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java?rev=1752745&r1=1752744&r2=1752745&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
Thu Jul 14 20:52:40 2016
@@ -183,7 +183,7 @@ public class SSLHostConfigCertificate im
public KeyStore getCertificateKeystore() throws IOException {
KeyStore result = certificateKeystore;
- if (result == null) {
+ if (result == null && storeType == StoreType.KEYSTORE) {
result = SSLUtilBase.getStore(getCertificateKeystoreType(),
getCertificateKeystoreProvider(),
getCertificateKeystoreFile(),
getCertificateKeystorePassword());
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1752745&r1=1752744&r2=1752745&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Jul 14 20:52:40 2016
@@ -60,6 +60,15 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Coyote">
+ <changelog>
+ <fix>
+ Correct a regression in refactoring to enable injection of custom
+ keystores that broke the automatic conversion of OpenSSL style PEM
+ key and certificate files for use with JSSE TLS connectors. (markt)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Jasper">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
