Author: markt
Date: Mon Feb 16 22:47:15 2015
New Revision: 1660241
URL: http://svn.apache.org/r1660241
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=1660241&r1=1660240&r2=1660241&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:47:15 2015
@@ -2491,6 +2491,20 @@ public enum Cipher {
256,
256
),
+ // Cipher C072
+ TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_CBC_SHA256(
+ "ECDHE-ECDSA-CAMELLIA128-SHA256",
+ KeyExchange.ECDHe,
+ Authentication.ECDSA,
+ Encryption.CAMELLIA128,
+ MessageDigest.SHA256,
+ Protocol.TLSv1_2,
+ false,
+ EncryptionLevel.HIGH,
+ true,
+ 128,
+ 128
+ ),
// Cipher C075
TLS_ECDH_ECDSA_WITH_CAMELLIA_256_CBC_SHA384(
"ECDH-ECDSA-CAMELLIA256-SHA384",
@@ -2505,6 +2519,20 @@ public enum Cipher {
256,
256
),
+ // Cipher C076
+ TLS_ECDHE_RSA_WITH_CAMELLIA_128_CBC_SHA256(
+ "ECDHE-RSA-CAMELLIA128-SHA256",
+ KeyExchange.ECDHe,
+ Authentication.RSA,
+ Encryption.CAMELLIA128,
+ MessageDigest.SHA256,
+ Protocol.TLSv1_2,
+ false,
+ EncryptionLevel.HIGH,
+ true,
+ 128,
+ 128
+ ),
// Cipher C079
TLS_ECDH_RSA_WITH_CAMELLIA_256_CBC_SHA384(
"ECDH-RSA-CAMELLIA256-SHA384",
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=1660241&r1=1660240&r2=1660241&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:47:15 2015
@@ -385,6 +385,8 @@ public class TestCipher {
"DES-CBC3-MD5+SSLv2",
"ECDH-ECDSA-CAMELLIA256-SHA384+TLSv1.2",
"ECDH-RSA-CAMELLIA256-SHA384+TLSv1.2",
+ "ECDHE-ECDSA-CAMELLIA128-SHA256+TLSv1.2",
+ "ECDHE-RSA-CAMELLIA128-SHA256+TLSv1.2",
"EXP-RC2-CBC-MD5+SSLv2",
"EXP-RC4-MD5+SSLv2",
"IDEA-CBC-MD5+SSLv2",
@@ -571,6 +573,8 @@ public class TestCipher {
"DHE-RSA-SEED-SHA+SSLv3",
"ECDH-ECDSA-CAMELLIA256-SHA384+TLSv1.2",
"ECDH-RSA-CAMELLIA256-SHA384+TLSv1.2",
+ "ECDHE-ECDSA-CAMELLIA128-SHA256+TLSv1.2",
+ "ECDHE-RSA-CAMELLIA128-SHA256+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
