Author: markt
Date: Mon Feb 16 22:26:37 2015
New Revision: 1660232
URL: http://svn.apache.org/r1660232
Log:
Another four new Ciphers for 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=1660232&r1=1660231&r2=1660232&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:26:37 2015
@@ -1731,6 +1731,62 @@ public enum Cipher {
256,
256
),
+ // Cipher BB
+ TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA256(
+ "DH-DSS-CAMELLIA128-SHA256",
+ KeyExchange.DHd,
+ Authentication.DH,
+ Encryption.CAMELLIA128,
+ MessageDigest.SHA256,
+ Protocol.TLSv1_2,
+ false,
+ EncryptionLevel.HIGH,
+ false,
+ 128,
+ 128
+ ),
+ // Cipher BC
+ TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA256(
+ "DH-RSA-CAMELLIA128-SHA256",
+ KeyExchange.DHr,
+ Authentication.DH,
+ Encryption.CAMELLIA128,
+ MessageDigest.SHA256,
+ Protocol.TLSv1_2,
+ false,
+ EncryptionLevel.HIGH,
+ false,
+ 128,
+ 128
+ ),
+ // Cipher BD
+ TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA256(
+ "DHE-DSS-CAMELLIA128-SHA256",
+ KeyExchange.EDH,
+ Authentication.DSS,
+ Encryption.CAMELLIA128,
+ MessageDigest.SHA256,
+ Protocol.TLSv1_2,
+ false,
+ EncryptionLevel.HIGH,
+ false,
+ 128,
+ 128
+ ),
+ // Cipher BE
+ TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256(
+ "DHE-RSA-CAMELLIA128-SHA256",
+ KeyExchange.EDH,
+ Authentication.RSA,
+ Encryption.CAMELLIA128,
+ MessageDigest.SHA256,
+ Protocol.TLSv1_2,
+ false,
+ EncryptionLevel.HIGH,
+ false,
+ 128,
+ 128
+ ),
/* ECC ciphersuites from draft-ietf-tls-ecc-01.txt (
Mar 15, 2001) */
// Cipher C001
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=1660232&r1=1660231&r2=1660232&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:26:37 2015
@@ -539,6 +539,7 @@ public class TestCipher {
"DH-DSS-AES256-SHA256+TLSv1.2",
"DH-DSS-CAMELLIA128-SHA+SSLv3",
"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,16 +552,19 @@ public class TestCipher {
"DH-RSA-AES256-SHA256+TLSv1.2",
"DH-RSA-CAMELLIA128-SHA+SSLv3",
"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-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-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
