Author: remy.maucherat(a)jboss.com Date: 2014-06-30 10:14:27 -0400 (Mon, 30 Jun 2014) New Revision: 2470 Modified: branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java Log: More for BZ1078204: OpenSSL allows a wide variety of separators. Submitted by Radim Hatlapatka. Modified: branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java =================================================================== --- branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java 2014-06-30 14:12:36 UTC (rev 2469) +++ branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java 2014-06-30 14:14:27 UTC (rev 2470) @@ -47,7 +47,7 @@ private static boolean initialized = false; - private static final String SEPARATOR = ":"; + private static final String SEPARATOR = ":|,| "; /** * If ! is used then the ciphers are permanently deleted from the list. The ciphers deleted can never reappear in the list * even if they are explicitly stated.