Author: markt
Date: Thu Dec 18 13:01:41 2014
New Revision: 1646449
URL: http://svn.apache.org/r1646449
Log:
Servlet API requires java.security.cert.X509Certificate[] so be explicit about
this in the support class.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/SSLSupport.java
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SSLSupport.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SSLSupport.java?rev=1646449&r1=1646448&r2=1646449&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SSLSupport.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SSLSupport.java Thu Dec 18
13:01:41 2014
@@ -18,6 +18,7 @@
package org.apache.tomcat.util.net;
import java.io.IOException;
+import java.security.cert.X509Certificate;
/**
* Defines an interface to interact with SSL sessions.
@@ -80,11 +81,12 @@ public interface SSLSupport {
/**
* The client certificate chain (if any).
- * @param force If <code>true</code>, then re-negotiate the
- * connection if necessary.
+ *
+ * @param force If <code>true</code>, then re-negotiate the connection and
+ * request a client certificate if a client certificate has
not
+ * already been requested.
*/
- public Object[] getPeerCertificateChain(boolean force)
- throws IOException;
+ public X509Certificate[] getPeerCertificateChain(boolean force) throws
IOException;
/**
* Get the keysize.
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java?rev=1646449&r1=1646448&r2=1646449&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java Thu Dec
18 13:01:41 2014
@@ -126,7 +126,7 @@ class JSSESupport implements SSLSupport,
}
@Override
- public Object[] getPeerCertificateChain(boolean force)
+ public java.security.cert.X509Certificate[]
getPeerCertificateChain(boolean force)
throws IOException {
// Look up the current SSLSession
if (session == null)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
