Author: markt
Date: Sat Nov 14 20:55:08 2015
New Revision: 1714369
URL: http://svn.apache.org/viewvc?rev=1714369&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=1714369&r1=1714368&r2=1714369&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:55:08 2015
@@ -368,8 +368,8 @@ public class TestCipher {
"DHE-PSK-AES128-CCM8+TLSv1.2",
"DHE-PSK-AES256-CCM+TLSv1.2",
"DHE-PSK-AES256-CCM8+TLSv1.2",
- "DHE-PSK-CAMELLIA128-SHA256+SSLv3",
- "DHE-PSK-CAMELLIA256-SHA384+SSLv3",
+ "DHE-PSK-CAMELLIA128-SHA256+TLSv1.0",
+ "DHE-PSK-CAMELLIA256-SHA384+TLSv1.0",
"DHE-RSA-AES128-CCM+TLSv1.2",
"DHE-RSA-AES128-CCM8+TLSv1.2",
"DHE-RSA-AES256-CCM+TLSv1.2",
@@ -384,8 +384,8 @@ public class TestCipher {
"ECDHE-ECDSA-AES256-CCM8+TLSv1.2",
"ECDHE-ECDSA-CAMELLIA128-SHA256+TLSv1.2",
"ECDHE-ECDSA-CAMELLIA256-SHA384+TLSv1.2",
- "ECDHE-PSK-CAMELLIA128-SHA256+SSLv3",
- "ECDHE-PSK-CAMELLIA256-SHA384+SSLv3",
+ "ECDHE-PSK-CAMELLIA128-SHA256+TLSv1.0",
+ "ECDHE-PSK-CAMELLIA256-SHA384+TLSv1.0",
"ECDHE-RSA-CAMELLIA128-SHA256+TLSv1.2",
"ECDHE-RSA-CAMELLIA256-SHA384+TLSv1.2",
"EXP-RC2-CBC-MD5+SSLv2",
@@ -395,12 +395,12 @@ public class TestCipher {
"PSK-AES128-CCM8+TLSv1.2",
"PSK-AES256-CCM+TLSv1.2",
"PSK-AES256-CCM8+TLSv1.2",
- "PSK-CAMELLIA128-SHA256+SSLv3",
- "PSK-CAMELLIA256-SHA384+SSLv3",
+ "PSK-CAMELLIA128-SHA256+TLSv1.0",
+ "PSK-CAMELLIA256-SHA384+TLSv1.0",
"RC2-CBC-MD5+SSLv2",
"RC4-MD5+SSLv2",
- "RSA-PSK-CAMELLIA128-SHA256+SSLv3",
- "RSA-PSK-CAMELLIA256-SHA384+SSLv3")));
+ "RSA-PSK-CAMELLIA128-SHA256+TLSv1.0",
+ "RSA-PSK-CAMELLIA256-SHA384+TLSv1.0")));
/**
@@ -585,17 +585,17 @@ public class TestCipher {
"DHE-DSS-SEED-SHA+SSLv3",
"DHE-PSK-3DES-EDE-CBC-SHA+SSLv3",
"DHE-PSK-AES128-CBC-SHA+SSLv3",
- "DHE-PSK-AES128-CBC-SHA256+SSLv3",
+ "DHE-PSK-AES128-CBC-SHA256+TLSV1.0",
"DHE-PSK-AES128-CCM+TLSv1.2",
"DHE-PSK-AES128-CCM8+TLSv1.2",
"DHE-PSK-AES128-GCM-SHA256+TLSv1.2",
"DHE-PSK-AES256-CBC-SHA+SSLv3",
- "DHE-PSK-AES256-CBC-SHA384+SSLv3",
+ "DHE-PSK-AES256-CBC-SHA384+TLSv1.0",
"DHE-PSK-AES256-CCM+TLSv1.2",
"DHE-PSK-AES256-CCM8+TLSv1.2",
"DHE-PSK-AES256-GCM-SHA384+TLSv1.2",
- "DHE-PSK-CAMELLIA128-SHA256+SSLv3",
- "DHE-PSK-CAMELLIA256-SHA384+SSLv3",
+ "DHE-PSK-CAMELLIA128-SHA256+TLSv1.0",
+ "DHE-PSK-CAMELLIA256-SHA384+TLSv1.0",
"DHE-PSK-NULL-SHA+SSLv3",
"DHE-PSK-NULL-SHA256+TLSv1.0",
"DHE-PSK-NULL-SHA384+TLSv1.0",
@@ -621,14 +621,14 @@ public class TestCipher {
"ECDHE-ECDSA-CAMELLIA256-SHA384+TLSv1.2",
"ECDHE-PSK-3DES-EDE-CBC-SHA+SSLv3",
"ECDHE-PSK-AES128-CBC-SHA+SSLv3",
- "ECDHE-PSK-AES128-CBC-SHA256+SSLv3",
+ "ECDHE-PSK-AES128-CBC-SHA256+TLSv1.0",
"ECDHE-PSK-AES256-CBC-SHA+SSLv3",
- "ECDHE-PSK-AES256-CBC-SHA384+SSLv3",
- "ECDHE-PSK-CAMELLIA128-SHA256+SSLv3",
- "ECDHE-PSK-CAMELLIA256-SHA384+SSLv3",
+ "ECDHE-PSK-AES256-CBC-SHA384+TLSv1.0",
+ "ECDHE-PSK-CAMELLIA128-SHA256+TLSv1.0",
+ "ECDHE-PSK-CAMELLIA256-SHA384+TLSv1.0",
"ECDHE-PSK-NULL-SHA+SSLv3",
- "ECDHE-PSK-NULL-SHA256+SSLv3",
- "ECDHE-PSK-NULL-SHA384+SSLv3",
+ "ECDHE-PSK-NULL-SHA256+TLSv1.o",
+ "ECDHE-PSK-NULL-SHA384+TLSv1.0",
"ECDHE-PSK-RC4-SHA+SSLv3",
"ECDHE-RSA-CAMELLIA128-SHA256+TLSv1.2",
"ECDHE-RSA-CAMELLIA256-SHA384+TLSv1.2",
@@ -640,7 +640,7 @@ public class TestCipher {
"IDEA-CBC-SHA+SSLv3",
"PSK-3DES-EDE-CBC-SHA+SSLv3",
"PSK-AES128-CBC-SHA+SSLv3",
- "PSK-AES128-CBC-SHA256+SSLv3",
+ "PSK-AES128-CBC-SHA256+TLSv1.0",
"PSK-AES128-CCM+TLSv1.2",
"PSK-AES128-CCM8+TLSv1.2",
"PSK-AES128-GCM-SHA256+TLSv1.2",
@@ -649,11 +649,11 @@ public class TestCipher {
"PSK-AES256-CCM+TLSv1.2",
"PSK-AES256-CCM8+TLSv1.2",
"PSK-AES256-GCM-SHA384+TLSv1.2",
- "PSK-CAMELLIA128-SHA256+SSLv3",
- "PSK-CAMELLIA256-SHA384+SSLv3",
+ "PSK-CAMELLIA128-SHA256+TLSv1.0",
+ "PSK-CAMELLIA256-SHA384+TLSv1.0",
"PSK-NULL-SHA+SSLv3",
- "PSK-NULL-SHA256+SSLv3",
- "PSK-NULL-SHA384+SSLv3",
+ "PSK-NULL-SHA256+TLSv1.0",
+ "PSK-NULL-SHA384+TLSv1.0",
"PSK-RC4-SHA+SSLv3",
"RC2-CBC-MD5+SSLv2",
"RC4-MD5+SSLv2",
@@ -662,13 +662,13 @@ public class TestCipher {
"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-CBC-SHA384+TLSv1.0",
"RSA-PSK-AES256-GCM-SHA384+TLSv1.2",
"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",
+ "RSA-PSK-NULL-SHA256+TLSv1.0",
+ "RSA-PSK-NULL-SHA384+TLSv1.0",
"RSA-PSK-RC4-SHA+SSLv3",
"SEED-SHA+SSLv3",
"SRP-AES-128-CBC-SHA+SSLv3",
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
