Author: markt
Date: Mon Apr 13 13:53:54 2015
New Revision: 1673192
URL: http://svn.apache.org/r1673192
Log:
Move JSSE specific method to JSSE base class
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=1673192&r1=1673191&r2=1673192&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Mon Apr
13 13:53:54 2015
@@ -32,9 +32,6 @@ import java.util.concurrent.Executor;
import java.util.concurrent.TimeUnit;
import javax.net.ssl.KeyManagerFactory;
-import javax.net.ssl.SSLEngine;
-import javax.net.ssl.SSLParameters;
-
import org.apache.juli.logging.Log;
import org.apache.tomcat.util.IntrospectionUtils;
import org.apache.tomcat.util.net.AbstractEndpoint.Acceptor.AcceptorState;
@@ -1076,23 +1073,6 @@ public abstract class AbstractEndpoint<S
.newSetFromMap(new ConcurrentHashMap<SocketWrapperBase<S>,
Boolean>());
/**
- * Configures SSLEngine to honor cipher suites ordering based upon
- * endpoint configuration.
- */
- protected void configureUseServerCipherSuitesOrder(SSLEngine engine) {
- String useServerCipherSuitesOrderStr = this
- .getUseServerCipherSuitesOrder().trim();
-
- SSLParameters sslParameters = engine.getSSLParameters();
- boolean useServerCipherSuitesOrder =
- ("true".equalsIgnoreCase(useServerCipherSuitesOrderStr)
- || "yes".equalsIgnoreCase(useServerCipherSuitesOrderStr));
-
- sslParameters.setUseCipherSuitesOrder(useServerCipherSuitesOrder);
- engine.setSSLParameters(sslParameters);
- }
-
- /**
* The async timeout thread.
*/
private AsyncTimeout asyncTimeout = null;
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java?rev=1673192&r1=1673191&r2=1673192&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java Mon
Apr 13 13:53:54 2015
@@ -19,6 +19,7 @@ package org.apache.tomcat.util.net;
import javax.net.ssl.KeyManager;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLEngine;
+import javax.net.ssl.SSLParameters;
import javax.net.ssl.SSLSessionContext;
import javax.net.ssl.X509KeyManager;
@@ -92,6 +93,24 @@ public abstract class AbstractJsseEndpoi
}
+ /**
+ * Configures SSLEngine to honor cipher suites ordering based upon
+ * endpoint configuration.
+ */
+ private void configureUseServerCipherSuitesOrder(SSLEngine engine) {
+ String useServerCipherSuitesOrderStr = this
+ .getUseServerCipherSuitesOrder().trim();
+
+ SSLParameters sslParameters = engine.getSSLParameters();
+ boolean useServerCipherSuitesOrder =
+ ("true".equalsIgnoreCase(useServerCipherSuitesOrderStr)
+ || "yes".equalsIgnoreCase(useServerCipherSuitesOrderStr));
+
+ sslParameters.setUseCipherSuitesOrder(useServerCipherSuitesOrder);
+ engine.setSSLParameters(sslParameters);
+ }
+
+
private KeyManager[] wrap(KeyManager[] managers) {
if (managers==null) return null;
KeyManager[] result = new KeyManager[managers.length];
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
