Author: markt
Date: Sat Aug 8 14:19:49 2015
New Revision: 1694803
URL: http://svn.apache.org/r1694803
Log:
Updates from testing on vmgump
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=1694803&r1=1694802&r2=1694803&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 14:19:49 2015
@@ -396,12 +396,14 @@ public class TestCipher {
Collections.unmodifiableSet(new HashSet<>(Arrays.asList(
"DES-CBC-MD5+SSLv2",
"DES-CBC3-MD5+SSLv2",
+ "DHE-PSK-AES128-CBC-SHA+SSLv3",
"ECDH-ECDSA-CAMELLIA128-SHA256+TLSv1.2",
"ECDH-ECDSA-CAMELLIA256-SHA384+TLSv1.2",
"ECDH-RSA-CAMELLIA128-SHA256+TLSv1.2",
"ECDH-RSA-CAMELLIA256-SHA384+TLSv1.2",
"ECDHE-ECDSA-CAMELLIA128-SHA256+TLSv1.2",
"ECDHE-ECDSA-CAMELLIA256-SHA384+TLSv1.2",
+ "ECDHE-PSK-NULL-SHA384+SSLv3",
"ECDHE-RSA-CAMELLIA128-SHA256+TLSv1.2",
"ECDHE-RSA-CAMELLIA256-SHA384+TLSv1.2",
"EXP-RC2-CBC-MD5+SSLv2",
@@ -602,6 +604,7 @@ public class TestCipher {
"ECDH-RSA-CAMELLIA256-SHA384+TLSv1.2",
"ECDHE-ECDSA-CAMELLIA128-SHA256+TLSv1.2",
"ECDHE-ECDSA-CAMELLIA256-SHA384+TLSv1.2",
+ "ECDHE-PSK-NULL-SHA384+SSLv3",
"ECDHE-RSA-CAMELLIA128-SHA256+TLSv1.2",
"ECDHE-RSA-CAMELLIA256-SHA384+TLSv1.2",
"EXP-DH-DSS-DES-CBC-SHA+SSLv3",
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
