Author: markt
Date: Sat Nov 14 20:46:49 2015
New Revision: 1714366
URL: http://svn.apache.org/viewvc?rev=1714366&view=rev
Log:
SSLv3 / TLSv1 updates from OpenSSL master
More to follow
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=1714366&r1=1714365&r2=1714366&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:46:49 2015
@@ -645,7 +645,7 @@ public class TestCipher {
"PSK-AES128-CCM8+TLSv1.2",
"PSK-AES128-GCM-SHA256+TLSv1.2",
"PSK-AES256-CBC-SHA+SSLv3",
- "PSK-AES256-CBC-SHA384+SSLv3",
+ "PSK-AES256-CBC-SHA384+TLSv1.0",
"PSK-AES256-CCM+TLSv1.2",
"PSK-AES256-CCM8+TLSv1.2",
"PSK-AES256-GCM-SHA384+TLSv1.2",
@@ -659,13 +659,13 @@ public class TestCipher {
"RC4-MD5+SSLv2",
"RSA-PSK-3DES-EDE-CBC-SHA+SSLv3",
"RSA-PSK-AES128-CBC-SHA+SSLv3",
- "RSA-PSK-AES128-CBC-SHA256+SSLv3",
+ "RSA-PSK-AES128-CBC-SHA256+TLSv1.0",
"RSA-PSK-AES128-GCM-SHA256+TLSv1.2",
"RSA-PSK-AES256-CBC-SHA+SSLv3",
"RSA-PSK-AES256-CBC-SHA384+SSLv3",
"RSA-PSK-AES256-GCM-SHA384+TLSv1.2",
- "RSA-PSK-CAMELLIA128-SHA256+SSLv3",
- "RSA-PSK-CAMELLIA256-SHA384+SSLv3",
+ "RSA-PSK-CAMELLIA128-SHA256+TLSv1.0",
+ "RSA-PSK-CAMELLIA256-SHA384+TLSv1.0",
"RSA-PSK-NULL-SHA+SSLv3",
"RSA-PSK-NULL-SHA256+SSLv3",
"RSA-PSK-NULL-SHA384+SSLv3",
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
