Author: markt Date: Mon Feb 16 22:29:00 2015 New Revision: 1660233 URL: http://svn.apache.org/r1660233 Log: Fix copy/paste error
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=1660233&r1=1660232&r2=1660233&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 Mon Feb 16 22:29:00 2015 @@ -538,8 +538,8 @@ public class TestCipher { "DH-DSS-AES256-SHA+SSLv3", "DH-DSS-AES256-SHA256+TLSv1.2", "DH-DSS-CAMELLIA128-SHA+SSLv3", + "DH-DSS-CAMELLIA128-SHA256+TLSv1.2", "DH-DSS-CAMELLIA256-SHA+SSLv3", - "DH-DSS-CAMELLIA256-SHA128+TLSv1.2", "DH-DSS-CAMELLIA256-SHA256+TLSv1.2", "DH-DSS-DES-CBC-SHA+SSLv3", "DH-DSS-DES-CBC3-SHA+SSLv3", @@ -551,20 +551,20 @@ public class TestCipher { "DH-RSA-AES256-SHA+SSLv3", "DH-RSA-AES256-SHA256+TLSv1.2", "DH-RSA-CAMELLIA128-SHA+SSLv3", + "DH-RSA-CAMELLIA128-SHA256+TLSv1.2", "DH-RSA-CAMELLIA256-SHA+SSLv3", - "DH-RSA-CAMELLIA256-SHA128+TLSv1.2", "DH-RSA-CAMELLIA256-SHA256+TLSv1.2", "DH-RSA-DES-CBC-SHA+SSLv3", "DH-RSA-DES-CBC3-SHA+SSLv3", "DH-RSA-SEED-SHA+SSLv3", "DHE-DSS-CAMELLIA128-SHA+SSLv3", + "DHE-DSS-CAMELLIA128-SHA256+TLSv1.2", "DHE-DSS-CAMELLIA256-SHA+SSLv3", - "DHE-DSS-CAMELLIA256-SHA128+TLSv1.2", "DHE-DSS-CAMELLIA256-SHA256+TLSv1.2", "DHE-DSS-SEED-SHA+SSLv3", "DHE-RSA-CAMELLIA128-SHA+SSLv3", + "DHE-RSA-CAMELLIA128-SHA256+TLSv1.2", "DHE-RSA-CAMELLIA256-SHA+SSLv3", - "DHE-RSA-CAMELLIA256-SHA128+TLSv1.2", "DHE-RSA-CAMELLIA256-SHA256+TLSv1.2", "DHE-RSA-SEED-SHA+SSLv3", "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