Author: markt
Date: Wed Aug 24 13:13:48 2016
New Revision: 1757520
URL: http://svn.apache.org/viewvc?rev=1757520&view=rev
Log:
ws police
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java
tomcat/trunk/test/webapp/WEB-INF/test.tld
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java?rev=1757520&r1=1757519&r2=1757520&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java Wed Aug 24
13:13:48 2016
@@ -32,6 +32,7 @@ import java.security.cert.CertificateFac
import java.security.cert.CollectionCertStoreParameters;
import java.security.cert.PKIXBuilderParameters;
import java.security.cert.X509CertSelector;
+import java.security.cert.X509Certificate;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -50,6 +51,7 @@ import javax.net.ssl.SSLSessionContext;
import javax.net.ssl.TrustManager;
import javax.net.ssl.TrustManagerFactory;
import javax.net.ssl.X509KeyManager;
+import javax.net.ssl.X509TrustManager;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
@@ -275,7 +277,16 @@ public class JSSEUtil extends SSLUtilBas
}
}
- return tms;
+ if (tms == null) {
+ return tms;
+ }
+
+ TrustManager[] result = new TrustManager[tms.length];
+
+ for (int i = 0; i < tms.length; i++) {
+ result[i] = new DebugTrustManager((X509TrustManager) tms[i]);
+ }
+ return result;
}
@Override
@@ -340,4 +351,30 @@ public class JSSEUtil extends SSLUtilBas
}
return crls;
}
+
+
+ private static class DebugTrustManager implements X509TrustManager {
+
+ private final X509TrustManager tm;
+
+ private DebugTrustManager(X509TrustManager tm) {
+ this.tm = tm;
+ }
+
+
+ @Override
+ public void checkClientTrusted(X509Certificate[] chain, String
authType) throws CertificateException {
+ tm.checkClientTrusted(chain, authType);
+ }
+
+ @Override
+ public void checkServerTrusted(X509Certificate[] chain, String
authType) throws CertificateException {
+ tm.checkServerTrusted(chain, authType);
+ }
+
+ @Override
+ public X509Certificate[] getAcceptedIssuers() {
+ return tm.getAcceptedIssuers();
+ }
+ }
}
Modified: tomcat/trunk/test/webapp/WEB-INF/test.tld
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp/WEB-INF/test.tld?rev=1757520&r1=1757519&r2=1757520&view=diff
==============================================================================
--- tomcat/trunk/test/webapp/WEB-INF/test.tld (original)
+++ tomcat/trunk/test/webapp/WEB-INF/test.tld Wed Aug 24 13:13:48 2016
@@ -31,7 +31,7 @@
java.lang.String trim(java.lang.String)
</function-signature>
</function>
-
+
<function>
<name>concat</name>
<function-class>org.apache.el.TesterFunctions</function-class>
@@ -39,5 +39,5 @@
java.lang.String concat(java.lang.String[])
</function-signature>
</function>
-
+
</taglib>
\ No newline at end of file
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1757520&r1=1757519&r2=1757520&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Aug 24 13:13:48 2016
@@ -263,7 +263,7 @@
</fix>
<fix>
<bug>60034</bug>: Correct a typo in the Manager How-To page of the
- documentation web application. (markt)
+ documentation web application. (markt)
</fix>
</changelog>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
