Author: markt
Date: Wed Jun 22 17:11:03 2011
New Revision: 1138555
URL: http://svn.apache.org/viewvc?rev=1138555&view=rev
Log:
Fix copy/paste error that broke crl handling
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
tomcat/trunk/webapps/docs/changelog.xml
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=1138555&r1=1138554&r2=1138555&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
Wed Jun 22 17:11:03 2011
@@ -508,17 +508,23 @@ public class JSSESocketFactory implement
@Override
public TrustManager[] getTrustManagers() throws Exception {
- String keystoreType = endpoint.getKeystoreType();
- if (keystoreType == null) {
- keystoreType = defaultKeystoreType;
+ String truststoreType = endpoint.getTruststoreType();
+ if (truststoreType == null) {
+ truststoreType =
System.getProperty("javax.net.ssl.trustStoreType");
}
-
- String algorithm = endpoint.getAlgorithm();
+ if (truststoreType == null) {
+ truststoreType = endpoint.getKeystoreType();
+ }
+ if (truststoreType == null) {
+ truststoreType = defaultKeystoreType;
+ }
+
+ String algorithm = endpoint.getTruststoreAlgorithm();
if (algorithm == null) {
- algorithm = KeyManagerFactory.getDefaultAlgorithm();
+ algorithm = TrustManagerFactory.getDefaultAlgorithm();
}
- return getTrustManagers(keystoreType, endpoint.getKeystoreProvider(),
+ return getTrustManagers(truststoreType, endpoint.getKeystoreProvider(),
algorithm);
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1138555&r1=1138554&r2=1138555&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Jun 22 17:11:03 2011
@@ -147,6 +147,10 @@
Various refactorings to reduce code duplication and unnecessary code in
the connectors. (markt)
</update>
+ <fix>
+ Correct a regression introduced in Apache Tomcat 7.0.11 that broke
+ certificate revokation list handling. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
