Author: markt
Date: Fri Aug 7 17:52:24 2015
New Revision: 1694716
URL: http://svn.apache.org/r1694716
Log:
Revert r1694715. Something isn't quite right. Revertiung until I figure out
what I broke.
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=1694716&r1=1694715&r2=1694716&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
Fri Aug 7 17:52:24 2015
@@ -392,21 +392,8 @@ public class TestCipher {
*/
private static Set<String> OPENSSL_UNMAPPED_ORACLE =
Collections.unmodifiableSet(new HashSet<>(Arrays.asList(
- "ADH-DES-CBC-SHA+SSLv3",
- "ADH-DES-CBC3-SHA+SSLv3",
- "ADH-RC4-MD5+SSLv3",
"DES-CBC-MD5+SSLv2",
- "DES-CBC-SHA+SSLv3",
"DES-CBC3-MD5+SSLv2",
- "DES-CBC3-SHA+SSLv3",
- "DH-DSS-DES-CBC-SHA+SSLv3",
- "DH-DSS-DES-CBC3-SHA+SSLv3",
- "DH-RSA-DES-CBC-SHA+SSLv3",
- "DH-RSA-DES-CBC3-SHA+SSLv3",
- "DHE-DSS-DES-CBC-SHA+SSLv3",
- "DHE-DSS-DES-CBC3-SHA+SSLv3",
- "DHE-RSA-DES-CBC-SHA+SSLv3",
- "DHE-RSA-DES-CBC3-SHA+SSLv3",
"ECDH-ECDSA-CAMELLIA128-SHA256+TLSv1.2",
"ECDH-ECDSA-CAMELLIA256-SHA384+TLSv1.2",
"ECDH-RSA-CAMELLIA128-SHA256+TLSv1.2",
@@ -415,22 +402,11 @@ public class TestCipher {
"ECDHE-ECDSA-CAMELLIA256-SHA384+TLSv1.2",
"ECDHE-RSA-CAMELLIA128-SHA256+TLSv1.2",
"ECDHE-RSA-CAMELLIA256-SHA384+TLSv1.2",
- "EXP-ADH-DES-CBC-SHA+SSLv3",
- "EXP-ADH-RC4-MD5+SSLv3",
- "EXP-DES-CBC-SHA+SSLv3",
- "EXP-DHE-DSS-DES-CBC-SHA+SSLv3",
- "EXP-DHE-RSA-DES-CBC-SHA+SSLv3",
"EXP-RC2-CBC-MD5+SSLv2",
- "EXP-RC2-CBC-MD5+SSLv3",
"EXP-RC4-MD5+SSLv2",
- "EXP-RC4-MD5+SSLv3",
"IDEA-CBC-MD5+SSLv2",
- "NULL-MD5+SSLv3",
- "NULL-SHA+SSLv3",
"RC2-CBC-MD5+SSLv2",
- "RC4-MD5+SSLv2",
- "RC4-MD5+SSLv3",
- "RC4-SHA+SSLv3")));
+ "RC4-MD5+SSLv2")));
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
