You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2015/02/17 00:40:51 UTC
svn commit: r1660251 -
/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
Author: markt
Date: Mon Feb 16 23:40:51 2015
New Revision: 1660251
URL: http://svn.apache.org/r1660251
Log:
Remaining new ciphers
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=1660251&r1=1660250&r2=1660251&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 23:40:51 2015
@@ -1675,52 +1675,94 @@ public enum Cipher {
256,
256
),
- // Cipher C1
- TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA256(
- "DH-DSS-CAMELLIA256-SHA256",
+ // Cipher BA
+ TLS_RSA_WITH_CAMELLIA_128_CBC_SHA256(
+ "CAMELLIA128-SHA256",
+ KeyExchange.RSA,
+ Authentication.RSA,
+ Encryption.CAMELLIA128,
+ MessageDigest.SHA256,
+ Protocol.TLSv1_2,
+ false,
+ EncryptionLevel.HIGH,
+ false,
+ 128,
+ 128
+ ),
+ // Cipher BB
+ TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA256(
+ "DH-DSS-CAMELLIA128-SHA256",
KeyExchange.DHd,
Authentication.DH,
- Encryption.CAMELLIA256,
+ Encryption.CAMELLIA128,
MessageDigest.SHA256,
Protocol.TLSv1_2,
false,
EncryptionLevel.HIGH,
false,
- 256,
- 256
+ 128,
+ 128
),
- // Cipher C2
- TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA256(
- "DH-RSA-CAMELLIA256-SHA256",
+ // Cipher BC
+ TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA256(
+ "DH-RSA-CAMELLIA128-SHA256",
KeyExchange.DHr,
Authentication.DH,
- Encryption.CAMELLIA256,
+ Encryption.CAMELLIA128,
MessageDigest.SHA256,
Protocol.TLSv1_2,
false,
EncryptionLevel.HIGH,
false,
- 256,
- 256
+ 128,
+ 128
),
- // Cipher C3
- TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA256(
- "DHE-DSS-CAMELLIA256-SHA256",
+ // Cipher BD
+ TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA256(
+ "DHE-DSS-CAMELLIA128-SHA256",
KeyExchange.EDH,
Authentication.DSS,
- Encryption.CAMELLIA256,
+ Encryption.CAMELLIA128,
MessageDigest.SHA256,
Protocol.TLSv1_2,
false,
EncryptionLevel.HIGH,
false,
- 256,
- 256
+ 128,
+ 128
),
- // Cipher C4
- TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256(
- "DHE-RSA-CAMELLIA256-SHA256",
+ // 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
+ ),
+ // Cipher BF
+ TLS_DH_anon_WITH_CAMELLIA_128_CBC_SHA256(
+ "ADH-CAMELLIA128-SHA256",
KeyExchange.EDH,
+ Authentication.aNULL,
+ Encryption.CAMELLIA128,
+ MessageDigest.SHA256,
+ Protocol.TLSv1_2,
+ false,
+ EncryptionLevel.HIGH,
+ false,
+ 128,
+ 128
+ ),
+ // Cipher C0
+ TLS_RSA_WITH_CAMELLIA_256_CBC_SHA256(
+ "CAMELLIA256-SHA256",
+ KeyExchange.RSA,
Authentication.RSA,
Encryption.CAMELLIA256,
MessageDigest.SHA256,
@@ -1731,50 +1773,64 @@ public enum Cipher {
256,
256
),
- // Cipher BB
- TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA256(
- "DH-DSS-CAMELLIA128-SHA256",
+ // Cipher C1
+ TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA256(
+ "DH-DSS-CAMELLIA256-SHA256",
KeyExchange.DHd,
Authentication.DH,
- Encryption.CAMELLIA128,
+ Encryption.CAMELLIA256,
MessageDigest.SHA256,
Protocol.TLSv1_2,
false,
EncryptionLevel.HIGH,
false,
- 128,
- 128
+ 256,
+ 256
),
- // Cipher BC
- TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA256(
- "DH-RSA-CAMELLIA128-SHA256",
+ // Cipher C2
+ TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA256(
+ "DH-RSA-CAMELLIA256-SHA256",
KeyExchange.DHr,
Authentication.DH,
- Encryption.CAMELLIA128,
+ Encryption.CAMELLIA256,
MessageDigest.SHA256,
Protocol.TLSv1_2,
false,
EncryptionLevel.HIGH,
false,
- 128,
- 128
+ 256,
+ 256
),
- // Cipher BD
- TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA256(
- "DHE-DSS-CAMELLIA128-SHA256",
+ // Cipher C3
+ TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA256(
+ "DHE-DSS-CAMELLIA256-SHA256",
KeyExchange.EDH,
Authentication.DSS,
- Encryption.CAMELLIA128,
+ Encryption.CAMELLIA256,
MessageDigest.SHA256,
Protocol.TLSv1_2,
false,
EncryptionLevel.HIGH,
false,
- 128,
- 128
+ 256,
+ 256
),
- // Cipher BE
- TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256(
+ // 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
+ ),
+ // + 0x00,0xC5 - ADH-CAMELLIA256-SHA256 TLSv1.2 Kx=DH Au=None Enc=Camellia(256) Mac=SHA256
+ TLS_DH_anon_WITH_CAMELLIA_256_CBC_SHA256(
"DHE-RSA-CAMELLIA128-SHA256",
KeyExchange.EDH,
Authentication.RSA,
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org