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 2016/03/03 11:48:59 UTC
svn commit: r1733438 -
/tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParserOnly.java
Author: markt
Date: Thu Mar 3 10:48:59 2016
New Revision: 1733438
URL: http://svn.apache.org/viewvc?rev=1733438&view=rev
Log:
Remove the test this time
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParserOnly.java
Modified: tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParserOnly.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParserOnly.java?rev=1733438&r1=1733437&r2=1733438&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParserOnly.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParserOnly.java Thu Mar 3 10:48:59 2016
@@ -84,44 +84,6 @@ public class TestOpenSSLCipherConfigurat
}
@Test
- public void testDefaultSort04() throws Exception {
- // Reproducing a failure observed on Gump with OpenSSL 1.1.x
- // Note: Failure seems to depend on the order ciphers are added to the
- // input list.
-
- LinkedHashSet<Cipher> input = new LinkedHashSet<>();
- input.add(Cipher.TLS_DH_anon_WITH_3DES_EDE_CBC_SHA);
- input.add(Cipher.TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA);
- input.add(Cipher.TLS_PSK_WITH_RC4_128_SHA);
- input.add(Cipher.TLS_RSA_WITH_RC4_128_MD5);
- input.add(Cipher.TLS_RSA_WITH_RC4_128_SHA);
- input.add(Cipher.TLS_DH_anon_WITH_RC4_128_MD5);
- input.add(Cipher.TLS_ECDH_anon_WITH_RC4_128_SHA);
- input.add(Cipher.TLS_DHE_PSK_WITH_RC4_128_SHA);
- input.add(Cipher.TLS_RSA_PSK_WITH_RC4_128_SHA);
- input.add(Cipher.TLS_ECDHE_PSK_WITH_RC4_128_SHA);
- input.add(Cipher.TLS_ECDHE_ECDSA_WITH_RC4_128_SHA);
- input.add(Cipher.TLS_ECDHE_RSA_WITH_RC4_128_SHA);
- LinkedHashSet<Cipher> result = OpenSSLCipherConfigurationParser.defaultSort(input);
-
- LinkedHashSet<Cipher> expected = new LinkedHashSet<>();
- expected.add(Cipher.TLS_ECDHE_RSA_WITH_RC4_128_SHA);
- expected.add(Cipher.TLS_ECDHE_ECDSA_WITH_RC4_128_SHA);
- expected.add(Cipher.TLS_ECDHE_PSK_WITH_RC4_128_SHA);
- expected.add(Cipher.TLS_RSA_PSK_WITH_RC4_128_SHA);
- expected.add(Cipher.TLS_DHE_PSK_WITH_RC4_128_SHA);
- expected.add(Cipher.TLS_ECDH_anon_WITH_RC4_128_SHA);
- expected.add(Cipher.TLS_DH_anon_WITH_RC4_128_MD5);
- expected.add(Cipher.TLS_RSA_WITH_RC4_128_SHA);
- expected.add(Cipher.TLS_RSA_WITH_RC4_128_MD5);
- expected.add(Cipher.TLS_PSK_WITH_RC4_128_SHA);
- expected.add(Cipher.TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA);
- expected.add(Cipher.TLS_DH_anon_WITH_3DES_EDE_CBC_SHA);
-
- Assert.assertEquals(expected.toString(), result.toString());
- }
-
- @Test
public void testRename01() throws Exception {
// EDH -> DHE
LinkedHashSet<Cipher> result =
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org