Simplify. SSLHostConfig always returns an OpenSSL configuration string.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1723193 13f79535-47bb-0310-9956-ffa450edef68
apache · Jan 5, 2016 · 5ac40b7 · 5ac40b7
1 parent 21eecfd
commit 5ac40b7
Showing 1 changed file with 3 additions and 17 deletions.
diff --git a/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java b/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
@@ -25,7 +25,6 @@
 import java.util.ArrayList;
 import java.util.Base64;
 import java.util.List;
-import java.util.StringTokenizer;
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 
 import javax.net.ssl.KeyManager;
@@ -49,7 +48,6 @@
 import org.apache.tomcat.util.net.SSLHostConfig;
 import org.apache.tomcat.util.net.SSLHostConfigCertificate;
 import org.apache.tomcat.util.net.jsse.JSSEKeyManager;
-import org.apache.tomcat.util.net.openssl.ciphers.CipherSuiteConverter;
 import org.apache.tomcat.util.net.openssl.ciphers.OpenSSLCipherConfigurationParser;
 import org.apache.tomcat.util.res.StringManager;
 
@@ -299,21 +297,9 @@ public synchronized void init(KeyManager[] kms, TrustManager[] tms, SecureRandom
             }
 
             // List the ciphers that the client is permitted to negotiate
-            String ciphers = sslHostConfig.getCiphers();
+            String opensslCipherConfig = sslHostConfig.getCiphers();
-            if (!("ALL".equals(ciphers)) && ciphers.indexOf(':') == -1) {
+            this.ciphers = OpenSSLCipherConfigurationParser.parseExpression(opensslCipherConfig);
-                StringTokenizer tok = new StringTokenizer(ciphers, ",");
+            SSLContext.setCipherSuite(ctx, opensslCipherConfig);
-                this.ciphers = new ArrayList<>();
-                while (tok.hasMoreTokens()) {
-                    String token = tok.nextToken().trim();
-                    if (!"".equals(token)) {
-                        this.ciphers.add(token);
-                    }
-                }
-                ciphers = CipherSuiteConverter.toOpenSsl(ciphers);
-            } else {
-                this.ciphers = OpenSSLCipherConfigurationParser.parseExpression(ciphers);
-            }
-            SSLContext.setCipherSuite(ctx, ciphers);
             // Load Server key and certificate
             if (certificate.getCertificateFile() != null) {
                 // Set certificate