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/21 17:17:23 UTC
svn commit: r1661386 -
/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
Author: markt
Date: Sat Feb 21 16:17:22 2015
New Revision: 1661386
URL: http://svn.apache.org/r1661386
Log:
Correct KeyExchange types for new Ciphers added for 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=1661386&r1=1661385&r2=1661386&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 Sat Feb 21 16:17:22 2015
@@ -2055,6 +2055,7 @@ public enum Cipher {
256,
256
),
+ // Cipher C010
TLS_ECDHE_RSA_WITH_NULL_SHA(
"ECDHE-RSA-NULL-SHA",
KeyExchange.EECDH,
@@ -2550,7 +2551,7 @@ public enum Cipher {
// Cipher C072
TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_CBC_SHA256(
"ECDHE-ECDSA-CAMELLIA128-SHA256",
- KeyExchange.ECDHe,
+ KeyExchange.EECDH,
Authentication.ECDSA,
Encryption.CAMELLIA128,
MessageDigest.SHA256,
@@ -2564,7 +2565,7 @@ public enum Cipher {
// Cipher C073
TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_CBC_SHA384(
"ECDHE-ECDSA-CAMELLIA256-SHA384",
- KeyExchange.ECDHe,
+ KeyExchange.EECDH,
Authentication.ECDSA,
Encryption.CAMELLIA256,
MessageDigest.SHA384,
@@ -2578,7 +2579,7 @@ public enum Cipher {
// Cipher C074
TLS_ECDH_ECDSA_WITH_CAMELLIA_128_CBC_SHA256(
"ECDH-ECDSA-CAMELLIA128-SHA256",
- KeyExchange.ECDHr,
+ KeyExchange.ECDHe,
Authentication.ECDSA,
Encryption.CAMELLIA128,
MessageDigest.SHA256,
@@ -2592,7 +2593,7 @@ public enum Cipher {
// Cipher C075
TLS_ECDH_ECDSA_WITH_CAMELLIA_256_CBC_SHA384(
"ECDH-ECDSA-CAMELLIA256-SHA384",
- KeyExchange.ECDHr,
+ KeyExchange.ECDHe,
Authentication.ECDSA,
Encryption.CAMELLIA256,
MessageDigest.SHA384,
@@ -2606,7 +2607,7 @@ public enum Cipher {
// Cipher C076
TLS_ECDHE_RSA_WITH_CAMELLIA_128_CBC_SHA256(
"ECDHE-RSA-CAMELLIA128-SHA256",
- KeyExchange.ECDHe,
+ KeyExchange.EECDH,
Authentication.RSA,
Encryption.CAMELLIA128,
MessageDigest.SHA256,
@@ -2620,7 +2621,7 @@ public enum Cipher {
// Cipher C077
TLS_ECDHE_RSA_WITH_CAMELLIA_256_CBC_SHA384(
"ECDHE-RSA-CAMELLIA256-SHA384",
- KeyExchange.ECDHe,
+ KeyExchange.EECDH,
Authentication.RSA,
Encryption.CAMELLIA256,
MessageDigest.SHA384,
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org