Author: markt
Date: Wed Aug 24 13:22:27 2016
New Revision: 1757522
URL: http://svn.apache.org/viewvc?rev=1757522&view=rev
Log:
Revert accidental commit of debug code
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java
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=1757522&r1=1757521&r2=1757522&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:22:27 2016
@@ -32,7 +32,6 @@ 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;
@@ -51,7 +50,6 @@ 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;
@@ -277,16 +275,7 @@ public class JSSEUtil extends SSLUtilBas
}
}
- 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;
+ return tms;
}
@Override
@@ -351,30 +340,4 @@ 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();
- }
- }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
