Author: markt
Date: Sat Aug 8 14:39:33 2015
New Revision: 1694805
URL: http://svn.apache.org/r1694805
Log:
First pass at updating unmapped list for IBM
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=1694805&r1=1694804&r2=1694805&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:39:33 2015
@@ -612,10 +612,19 @@ public class TestCipher {
"DHE-DSS-CAMELLIA256-SHA+SSLv3",
"DHE-DSS-CAMELLIA256-SHA256+TLSv1.2",
"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-GCM-SHA256+TLSv1.2",
+ "DHE-PSK-AES256-CBC-SHA+SSLv3",
+ "DHE-PSK-AES256-CBC-SHA384+SSLv3",
"DHE-PSK-AES256-GCM-SHA384+TLSv1.2",
+ "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-RC4-SHA+SSLv3",
"DHE-RSA-CAMELLIA128-SHA+SSLv3",
"DHE-RSA-CAMELLIA128-SHA256+TLSv1.2",
"DHE-RSA-CAMELLIA256-SHA+SSLv3",
@@ -627,7 +636,17 @@ public class TestCipher {
"ECDH-RSA-CAMELLIA256-SHA384+TLSv1.2",
"ECDHE-ECDSA-CAMELLIA128-SHA256+TLSv1.2",
"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-AES256-CBC-SHA+SSLv3",
+ "ECDHE-PSK-AES256-CBC-SHA384+SSLv3",
+ "ECDHE-PSK-CAMELLIA128-SHA256+SSLv3",
+ "ECDHE-PSK-CAMELLIA256-SHA384+SSLv3",
+ "ECDHE-PSK-NULL-SHA+SSLv3",
+ "ECDHE-PSK-NULL-SHA256+SSLv3",
"ECDHE-PSK-NULL-SHA384+SSLv3",
+ "ECDHE-PSK-RC4-SHA+SSLv3",
"ECDHE-RSA-CAMELLIA128-SHA256+TLSv1.2",
"ECDHE-RSA-CAMELLIA256-SHA384+TLSv1.2",
"EXP-DH-DSS-DES-CBC-SHA+SSLv3",
@@ -638,14 +657,32 @@ 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-GCM-SHA256+TLSv1.2",
"PSK-AES256-CBC-SHA+SSLv3",
+ "PSK-AES256-CBC-SHA384+SSLv3",
"PSK-AES256-GCM-SHA384+TLSv1.2",
+ "PSK-CAMELLIA128-SHA256+SSLv3",
+ "PSK-CAMELLIA256-SHA384+SSLv3",
"PSK-NULL-SHA+SSLv3",
+ "PSK-NULL-SHA256+SSLv3",
+ "PSK-NULL-SHA384+SSLv3",
"PSK-RC4-SHA+SSLv3",
"RC2-CBC-MD5+SSLv2",
"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-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-NULL-SHA+SSLv3",
+ "RSA-PSK-NULL-SHA256+SSLv3",
+ "RSA-PSK-NULL-SHA384+SSLv3",
+ "RSA-PSK-RC4-SHA+SSLv3",
"SEED-SHA+SSLv3",
"SRP-AES-128-CBC-SHA+SSLv3",
"SRP-AES-256-CBC-SHA+SSLv3",
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
