Author: markt
Date: Sat Aug 8 15:21:30 2015
New Revision: 1694811
URL: http://svn.apache.org/r1694811
Log:
Update for Gump now these are known Ciphers
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=1694811&r1=1694810&r2=1694811&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
Sat Aug 8 15:21:30 2015
@@ -396,12 +396,8 @@ public class TestCipher {
Collections.unmodifiableSet(new HashSet<>(Arrays.asList(
"DES-CBC-MD5+SSLv2",
"DES-CBC3-MD5+SSLv2",
- "DHE-PSK-3DES-EDE-CBC-SHA+SSLv3",
- "DHE-PSK-AES128-CBC-SHA+SSLv3",
- "DHE-PSK-AES256-CBC-SHA+SSLv3",
"DHE-PSK-CAMELLIA128-SHA256+SSLv3",
"DHE-PSK-CAMELLIA256-SHA384+SSLv3",
- "DHE-PSK-RC4-SHA+SSLv3",
"ECDH-ECDSA-CAMELLIA128-SHA256+TLSv1.2",
"ECDH-ECDSA-CAMELLIA256-SHA384+TLSv1.2",
"ECDH-RSA-CAMELLIA128-SHA256+TLSv1.2",
@@ -428,12 +424,8 @@ public class TestCipher {
"PSK-CAMELLIA256-SHA384+SSLv3",
"RC2-CBC-MD5+SSLv2",
"RC4-MD5+SSLv2",
- "RSA-PSK-3DES-EDE-CBC-SHA+SSLv3",
- "RSA-PSK-AES128-CBC-SHA+SSLv3",
- "RSA-PSK-AES256-CBC-SHA+SSLv3",
"RSA-PSK-CAMELLIA128-SHA256+SSLv3",
- "RSA-PSK-CAMELLIA256-SHA384+SSLv3",
- "RSA-PSK-RC4-SHA+SSLv3")));
+ "RSA-PSK-CAMELLIA256-SHA384+SSLv3")));
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
