tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1660227 - /tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
Date Mon, 16 Feb 2015 22:14:19 GMT
Author: markt
Date: Mon Feb 16 22:14:18 2015
New Revision: 1660227

URL: http://svn.apache.org/r1660227
Log:
4 new ciphers supported in OpenSSL 1.1.0

Modified:
    tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.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=1660227&r1=1660226&r2=1660227&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:14:18
2015
@@ -1675,6 +1675,62 @@ public enum Cipher {
             256,
             256
     ),
+    // Cipher C1
+    TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA256(
+            "DH-DSS-CAMELLIA256-SHA256",
+            KeyExchange.DHd,
+            Authentication.DH,
+            Encryption.CAMELLIA256,
+            MessageDigest.SHA256,
+            Protocol.TLSv1_2,
+            false,
+            EncryptionLevel.HIGH,
+            false,
+            256,
+            256
+    ),
+    // Cipher C2
+    TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA256(
+            "DH-RSA-CAMELLIA256-SHA256",
+            KeyExchange.DHr,
+            Authentication.DH,
+            Encryption.CAMELLIA256,
+            MessageDigest.SHA256,
+            Protocol.TLSv1_2,
+            false,
+            EncryptionLevel.HIGH,
+            false,
+            256,
+            256
+    ),
+    // Cipher C3
+    TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA256(
+            "DHE-DSS-CAMELLIA256-SHA256",
+            KeyExchange.EDH,
+            Authentication.DSS,
+            Encryption.CAMELLIA256,
+            MessageDigest.SHA256,
+            Protocol.TLSv1_2,
+            false,
+            EncryptionLevel.HIGH,
+            false,
+            256,
+            256
+    ),
+    // Cipher C4
+    TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256(
+            "DHE-RSA-CAMELLIA256-SHA256",
+            KeyExchange.EDH,
+            Authentication.RSA,
+            Encryption.CAMELLIA256,
+            MessageDigest.SHA256,
+            Protocol.TLSv1_2,
+            false,
+            EncryptionLevel.HIGH,
+            false,
+            256,
+            256
+    ),
     /* ECC ciphersuites from draft-ietf-tls-ecc-01.txt (
             Mar 15, 2001) */
     // Cipher C001



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message