svn commit: r1614347 - /tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java

[markt]

Author: markt
Date: Tue Jul 29 13:44:27 2014
New Revision: 1614347

URL: http://svn.apache.org/r1614347
Log:
IBM cipher suite names can use SSL_ or TLS_ at the start so modify mapping test 
to take account of this.
Test still fails so it is still commented out.

Modified:
    tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java

Modified: 
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java?rev=1614347&r1=1614346&r2=1614347&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java 
(original)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java 
Tue Jul 29 13:44:27 2014
@@ -10,6 +10,7 @@ import java.util.Set;
 import org.apache.catalina.util.IOTools;
 import org.apache.tomcat.util.http.fileupload.ByteArrayOutputStream;
 import org.junit.Assert;
+//import org.junit.Test;
 
 public class TestCipher {
 
@@ -314,9 +315,13 @@ public class TestCipher {
      * These are all the IBM standard Java names for cipher suites taken from
      * 
http://www-01.ibm.com/support/knowledgecenter/SSYKE2_7.0.0/com.ibm.java.security.component.71.doc/security-component/jsse2Docs/ciphersuites.html?lang=en
      * on 29th July 2014.
+     * <br>
+     * Note that IBM cipher suites names can begin with TLS or SSL.
      */
-    private static final Set<String> CIPHER_SUITE_STANDARD_NAMES_IBM =
-            Collections.unmodifiableSet(new HashSet<>(Arrays.asList(
+    private static final Set<String> CIPHER_SUITE_STANDARD_NAMES_IBM;
+
+    static {
+        Set<String> sslNames = new HashSet<>(Arrays.asList(
             "SSL_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384",
             "SSL_ECDHE_RSA_WITH_AES_256_CBC_SHA384",
             "SSL_RSA_WITH_AES_256_CBC_SHA256",
@@ -416,7 +421,18 @@ public class TestCipher {
             "SSL_KRB5_EXPORT_WITH_RC4_40_MD5",
             "SSL_KRB5_EXPORT_WITH_DES_CBC_40_SHA",
             "SSL_KRB5_EXPORT_WITH_DES_CBC_40_MD5",
-            "SSL_RSA_EXPORT_WITH_RC2_CBC_40_MD5")));
+            "SSL_RSA_EXPORT_WITH_RC2_CBC_40_MD5"));
+
+        Set<String> allNames = new HashSet<>();
+
+        allNames.addAll(sslNames);
+
+        for (String sslName : sslNames) {
+            allNames.add("TLS" + sslName.substring(3));
+        }
+
+        CIPHER_SUITE_STANDARD_NAMES_IBM = 
Collections.unmodifiableSet(allNames);
+    }
 
 
     /**



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org