Author: markt
Date: Fri Feb 15 14:25:46 2019
New Revision: 1853648
URL: http://svn.apache.org/viewvc?rev=1853648&view=rev
Log:
Remove unsued code
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java?rev=1853648&r1=1853647&r2=1853648&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
Fri Feb 15 14:25:46 2019
@@ -52,7 +52,6 @@ import org.apache.tomcat.util.net.SSLHos
import org.apache.tomcat.util.net.SSLHostConfigCertificate;
import org.apache.tomcat.util.net.SSLHostConfigCertificate.Type;
import org.apache.tomcat.util.net.jsse.JSSEKeyManager;
-import
org.apache.tomcat.util.net.openssl.ciphers.OpenSSLCipherConfigurationParser;
import org.apache.tomcat.util.res.StringManager;
public class OpenSSLContext implements org.apache.tomcat.util.net.SSLContext {
@@ -73,12 +72,6 @@ public class OpenSSLContext implements o
private final List<String> negotiableProtocols;
- private List<String> jsseCipherNames = new ArrayList<>();
-
- public List<String> getJsseCipherNames() {
- return jsseCipherNames;
- }
-
private String enabledProtocol;
public String getEnabledProtocol() {
@@ -270,9 +263,8 @@ public class OpenSSLContext implements o
}
// List the ciphers that the client is permitted to negotiate
- String opensslCipherConfig = sslHostConfig.getCiphers();
- this.jsseCipherNames =
OpenSSLCipherConfigurationParser.parseExpression(opensslCipherConfig);
- SSLContext.setCipherSuite(ctx, opensslCipherConfig);
+ SSLContext.setCipherSuite(ctx, sslHostConfig.getCiphers());
+
// Load Server key and certificate
if (certificate.getCertificateFile() != null) {
// Set certificate
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
