svn commit: r1819063 - /tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/Cipher.java

[markt]

Author: markt
Date: Fri Dec 22 16:47:40 2017
New Revision: 1819063

URL: http://svn.apache.org/viewvc?rev=1819063&view=rev
Log:
Correct key exchange for some of the newly added ARIA ciphers

Modified:
    tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/Cipher.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/Cipher.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/Cipher.java?rev=1819063&r1=1819062&r2=1819063&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/Cipher.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/Cipher.java 
Fri Dec 22 16:47:40 2017
@@ -3819,7 +3819,7 @@ public enum Cipher {
     TLS_ECDHE_ECDSA_WITH_ARIA_128_GCM_SHA256(
             0xC05C,
             "ECDHE-ECDSA-ARIA128-GCM-SHA256",
-            KeyExchange.ECDHe,
+            KeyExchange.EECDH,
             Authentication.ECDSA,
             Encryption.ARIA128GCM,
             MessageDigest.SHA256,
@@ -3835,7 +3835,7 @@ public enum Cipher {
     TLS_ECDHE_ECDSA_WITH_ARIA_256_GCM_SHA384(
             0xC05D,
             "ECDHE-ECDSA-ARIA256-GCM-SHA384",
-            KeyExchange.ECDHe,
+            KeyExchange.EECDH,
             Authentication.ECDSA,
             Encryption.ARIA256GCM,
             MessageDigest.SHA384,
@@ -3856,7 +3856,7 @@ public enum Cipher {
     TLS_ECDHE_RSA_WITH_ARIA_128_GCM_SHA256(
             0xC060,
             "ECDHE-ARIA128-GCM-SHA256",
-            KeyExchange.ECDHe,
+            KeyExchange.EECDH,
             Authentication.RSA,
             Encryption.ARIA128GCM,
             MessageDigest.SHA256,
@@ -3872,7 +3872,7 @@ public enum Cipher {
     TLS_ECDHE_RSA_WITH_ARIA_256_GCM_SHA384(
             0xC061,
             "ECDHE-ARIA256-GCM-SHA384",
-            KeyExchange.ECDHe,
+            KeyExchange.EECDH,
             Authentication.RSA,
             Encryption.ARIA256GCM,
             MessageDigest.SHA384,



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