Author: markt
Date: Mon Feb 16 22:39:50 2015
New Revision: 1660239
URL: http://svn.apache.org/r1660239
Log:
2 more cipher suites new to OpenSSL 1.1.0
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TestCipher.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java?rev=1660239&r1=1660238&r2=1660239&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java Mon
Feb 16 22:39:50 2015
@@ -2491,6 +2491,34 @@ public enum Cipher {
256,
256
),
+ // Cipher C075
+ TLS_ECDH_ECDSA_WITH_CAMELLIA_256_CBC_SHA384(
+ "ECDH-ECDSA-CAMELLIA256-SHA384",
+ KeyExchange.ECDHr,
+ Authentication.ECDSA,
+ Encryption.CAMELLIA256,
+ MessageDigest.SHA384,
+ Protocol.TLSv1_2,
+ false,
+ EncryptionLevel.HIGH,
+ true,
+ 256,
+ 256
+ ),
+ // Cipher C079
+ TLS_ECDH_RSA_WITH_CAMELLIA_256_CBC_SHA384(
+ "ECDH-RSA-CAMELLIA256-SHA384",
+ KeyExchange.ECDHr,
+ Authentication.RSA,
+ Encryption.CAMELLIA256,
+ MessageDigest.SHA384,
+ Protocol.TLSv1_2,
+ false,
+ EncryptionLevel.HIGH,
+ true,
+ 256,
+ 256
+ ),
// RC4_128_WITH_MD5
SSL_CK_RC4_128_WITH_MD5(
"RC4-MD5",
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=1660239&r1=1660238&r2=1660239&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:39:50 2015
@@ -383,6 +383,8 @@ public class TestCipher {
Collections.unmodifiableSet(new HashSet<>(Arrays.asList(
"DES-CBC-MD5+SSLv2",
"DES-CBC3-MD5+SSLv2",
+ "ECDH-ECDSA-CAMELLIA256-SHA384+TLSv1.2",
+ "ECDH-RSA-CAMELLIA256-SHA384+TLSv1.2",
"EXP-RC2-CBC-MD5+SSLv2",
"EXP-RC4-MD5+SSLv2",
"IDEA-CBC-MD5+SSLv2",
@@ -567,6 +569,8 @@ public class TestCipher {
"DHE-RSA-CAMELLIA256-SHA+SSLv3",
"DHE-RSA-CAMELLIA256-SHA256+TLSv1.2",
"DHE-RSA-SEED-SHA+SSLv3",
+ "ECDH-ECDSA-CAMELLIA256-SHA384+TLSv1.2",
+ "ECDH-RSA-CAMELLIA256-SHA384+TLSv1.2",
"EXP-DH-DSS-DES-CBC-SHA+SSLv3",
"EXP-DH-RSA-DES-CBC-SHA+SSLv3",
"EXP-RC2-CBC-MD5+SSLv2",
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
