Author: markt
Date: Sat Nov 14 20:45:10 2015
New Revision: 1714364
URL: http://svn.apache.org/viewvc?rev=1714364&view=rev
Log:
Sync with gump
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestCipher.java
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestCipher.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestCipher.java?rev=1714364&r1=1714363&r2=1714364&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestCipher.java
(original)
+++
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestCipher.java
Sat Nov 14 20:45:10 2015
@@ -597,8 +597,8 @@ public class TestCipher {
"DHE-PSK-CAMELLIA128-SHA256+SSLv3",
"DHE-PSK-CAMELLIA256-SHA384+SSLv3",
"DHE-PSK-NULL-SHA+SSLv3",
- "DHE-PSK-NULL-SHA256+SSLv3",
- "DHE-PSK-NULL-SHA384+SSLv3",
+ "DHE-PSK-NULL-SHA256+TLSv1.0",
+ "DHE-PSK-NULL-SHA384+TLSv1.0",
"DHE-PSK-RC4-SHA+SSLv3",
"DHE-RSA-AES128-CCM+TLSv1.2",
"DHE-RSA-AES128-CCM8+TLSv1.2",
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
