You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2014/08/12 17:45:57 UTC
svn commit: r1617512 -
/tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Author: markt
Date: Tue Aug 12 15:45:56 2014
New Revision: 1617512
URL: http://svn.apache.org/r1617512
Log:
Fix failures in testAllOpenSSLCiphersMapped() after changes to how unit test reports cipher names in r1615205
Start to fix testOpenSSLCipherAvailability() but more work required
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=1617512&r1=1617511&r2=1617512&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 Aug 12 15:45:56 2014
@@ -114,7 +114,7 @@ public class TestCipher {
if (openSSLAlias.contains("RC2-MD5")) {
continue;
}
- expectedCipherSuites.add(openSSLAlias);
+ expectedCipherSuites.add(openSSLAlias + "+" + cipher.getProtocol());
}
Set<String> unavailableCipherSuites = new HashSet<>();
@@ -142,7 +142,7 @@ public class TestCipher {
/**
* Check that the elements of the Cipher enumeration are all using standard
- * names from the TLS registry orare known exceptions.
+ * names from the TLS registry or are known exceptions.
*/
@Test
public void testNames() {
@@ -389,10 +389,13 @@ public class TestCipher {
*/
private static Set<String> OPENSSL_UNMAPPED_ORACLE =
Collections.unmodifiableSet(new HashSet<>(Arrays.asList(
- "DES-CBC-MD5",
- "DES-CBC3-MD5",
- "IDEA-CBC-MD5",
- "RC2-CBC-MD5")));
+ "DES-CBC-MD5+SSLv2",
+ "DES-CBC3-MD5+SSLv2",
+ "EXP-RC2-CBC-MD5+SSLv2",
+ "EXP-RC4-MD5+SSLv2",
+ "IDEA-CBC-MD5+SSLv2",
+ "RC2-CBC-MD5+SSLv2",
+ "RC4-MD5+SSLv2")));
/**
@@ -525,36 +528,39 @@ public class TestCipher {
*/
private static Set<String> OPENSSL_UNMAPPED_IBM =
Collections.unmodifiableSet(new HashSet<>(Arrays.asList(
- "ADH-CAMELLIA128-SHA",
- "ADH-CAMELLIA256-SHA",
- "ADH-SEED-SHA",
- "CAMELLIA128-SHA",
- "CAMELLIA256-SHA",
- "DES-CBC-MD5",
- "DES-CBC3-MD5",
- "DHE-DSS-CAMELLIA128-SHA",
- "DHE-DSS-CAMELLIA256-SHA",
- "DHE-DSS-SEED-SHA",
- "DHE-RSA-CAMELLIA128-SHA",
- "DHE-RSA-CAMELLIA256-SHA",
- "DHE-RSA-SEED-SHA",
- "IDEA-CBC-MD5",
- "IDEA-CBC-SHA",
- "PSK-3DES-EDE-CBC-SHA",
- "PSK-AES128-CBC-SHA",
- "PSK-AES256-CBC-SHA",
- "PSK-RC4-SHA",
- "RC2-CBC-MD5",
- "SEED-SHA",
- "SRP-AES-128-CBC-SHA",
- "SRP-AES-256-CBC-SHA",
- "SRP-3DES-EDE-CBC-SHA",
- "SRP-DSS-3DES-EDE-CBC-SHA",
- "SRP-DSS-AES-128-CBC-SHA",
- "SRP-DSS-AES-256-CBC-SHA",
- "SRP-RSA-3DES-EDE-CBC-SHA",
- "SRP-RSA-AES-128-CBC-SHA",
- "SRP-RSA-AES-256-CBC-SHA")));
+ "ADH-CAMELLIA128-SHA+SSLv3",
+ "ADH-CAMELLIA256-SHA+SSLv3",
+ "ADH-SEED-SHA+SSLv3",
+ "CAMELLIA128-SHA+SSLv3",
+ "CAMELLIA256-SHA+SSLv3",
+ "DES-CBC-MD5+SSLv2",
+ "DES-CBC3-MD5+SSLv2",
+ "DHE-DSS-CAMELLIA128-SHA+SSLv3",
+ "DHE-DSS-CAMELLIA256-SHA+SSLv3",
+ "DHE-DSS-SEED-SHA+SSLv3",
+ "DHE-RSA-CAMELLIA128-SHA+SSLv3",
+ "DHE-RSA-CAMELLIA256-SHA+SSLv3",
+ "DHE-RSA-SEED-SHA+SSLv3",
+ "EXP-RC2-CBC-MD5+SSLv2",
+ "EXP-RC4-MD5+SSLv2",
+ "IDEA-CBC-MD5+SSLv2",
+ "IDEA-CBC-SHA+SSLv3",
+ "PSK-3DES-EDE-CBC-SHA+SSLv3",
+ "PSK-AES128-CBC-SHA+SSLv3",
+ "PSK-AES256-CBC-SHA+SSLv3",
+ "PSK-RC4-SHA+SSLv3",
+ "RC2-CBC-MD5+SSLv2",
+ "RC4-MD5+SSLv2",
+ "SEED-SHA+SSLv3",
+ "SRP-AES-128-CBC-SHA+SSLv3",
+ "SRP-AES-256-CBC-SHA+SSLv3",
+ "SRP-3DES-EDE-CBC-SHA+SSLv3",
+ "SRP-DSS-3DES-EDE-CBC-SHA+SSLv3",
+ "SRP-DSS-AES-128-CBC-SHA+SSLv3",
+ "SRP-DSS-AES-256-CBC-SHA+SSLv3",
+ "SRP-RSA-3DES-EDE-CBC-SHA+SSLv3",
+ "SRP-RSA-AES-128-CBC-SHA+SSLv3",
+ "SRP-RSA-AES-256-CBC-SHA+SSLv3")));
private static JsseImpl ORACLE_JSSE_CIPHER_IMPL = new JsseImpl("Oracle",
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org