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

[markt]

Author: markt
Date: Fri Dec 22 17:37:35 2017
New Revision: 1819074

URL: http://svn.apache.org/viewvc?rev=1819074&view=rev
Log:
Correct message digest for 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=1819074&r1=1819073&r2=1819074&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 17:37:35 2017
@@ -3716,7 +3716,7 @@ public enum Cipher {
             KeyExchange.RSA,
             Authentication.RSA,
             Encryption.ARIA128GCM,
-            MessageDigest.SHA256,
+            MessageDigest.AEAD,
             Protocol.TLSv1_2,
             false,
             EncryptionLevel.HIGH,
@@ -3732,7 +3732,7 @@ public enum Cipher {
             KeyExchange.RSA,
             Authentication.RSA,
             Encryption.ARIA256GCM,
-            MessageDigest.SHA384,
+            MessageDigest.AEAD,
             Protocol.TLSv1_2,
             false,
             EncryptionLevel.HIGH,
@@ -3748,7 +3748,7 @@ public enum Cipher {
             KeyExchange.EDH,
             Authentication.RSA,
             Encryption.ARIA128GCM,
-            MessageDigest.SHA256,
+            MessageDigest.AEAD,
             Protocol.TLSv1_2,
             false,
             EncryptionLevel.HIGH,
@@ -3764,7 +3764,7 @@ public enum Cipher {
             KeyExchange.EDH,
             Authentication.RSA,
             Encryption.ARIA256GCM,
-            MessageDigest.SHA384,
+            MessageDigest.AEAD,
             Protocol.TLSv1_2,
             false,
             EncryptionLevel.HIGH,
@@ -3785,7 +3785,7 @@ public enum Cipher {
             KeyExchange.EDH,
             Authentication.DSS,
             Encryption.ARIA128GCM,
-            MessageDigest.SHA256,
+            MessageDigest.AEAD,
             Protocol.TLSv1_2,
             false,
             EncryptionLevel.HIGH,
@@ -3801,7 +3801,7 @@ public enum Cipher {
             KeyExchange.EDH,
             Authentication.DSS,
             Encryption.ARIA256GCM,
-            MessageDigest.SHA384,
+            MessageDigest.AEAD,
             Protocol.TLSv1_2,
             false,
             EncryptionLevel.HIGH,
@@ -3822,7 +3822,7 @@ public enum Cipher {
             KeyExchange.EECDH,
             Authentication.ECDSA,
             Encryption.ARIA128GCM,
-            MessageDigest.SHA256,
+            MessageDigest.AEAD,
             Protocol.TLSv1_2,
             false,
             EncryptionLevel.HIGH,
@@ -3838,7 +3838,7 @@ public enum Cipher {
             KeyExchange.EECDH,
             Authentication.ECDSA,
             Encryption.ARIA256GCM,
-            MessageDigest.SHA384,
+            MessageDigest.AEAD,
             Protocol.TLSv1_2,
             false,
             EncryptionLevel.HIGH,
@@ -3859,7 +3859,7 @@ public enum Cipher {
             KeyExchange.EECDH,
             Authentication.RSA,
             Encryption.ARIA128GCM,
-            MessageDigest.SHA256,
+            MessageDigest.AEAD,
             Protocol.TLSv1_2,
             false,
             EncryptionLevel.HIGH,
@@ -3875,7 +3875,7 @@ public enum Cipher {
             KeyExchange.EECDH,
             Authentication.RSA,
             Encryption.ARIA256GCM,
-            MessageDigest.SHA384,
+            MessageDigest.AEAD,
             Protocol.TLSv1_2,
             false,
             EncryptionLevel.HIGH,
@@ -3896,7 +3896,7 @@ public enum Cipher {
             KeyExchange.PSK,
             Authentication.PSK,
             Encryption.ARIA128GCM,
-            MessageDigest.SHA256,
+            MessageDigest.AEAD,
             Protocol.TLSv1_2,
             false,
             EncryptionLevel.HIGH,
@@ -3912,7 +3912,7 @@ public enum Cipher {
             KeyExchange.PSK,
             Authentication.PSK,
             Encryption.ARIA256GCM,
-            MessageDigest.SHA384,
+            MessageDigest.AEAD,
             Protocol.TLSv1_2,
             false,
             EncryptionLevel.HIGH,
@@ -3928,7 +3928,7 @@ public enum Cipher {
             KeyExchange.DHEPSK,
             Authentication.PSK,
             Encryption.ARIA128GCM,
-            MessageDigest.SHA256,
+            MessageDigest.AEAD,
             Protocol.TLSv1_2,
             false,
             EncryptionLevel.HIGH,
@@ -3944,7 +3944,7 @@ public enum Cipher {
             KeyExchange.DHEPSK,
             Authentication.PSK,
             Encryption.ARIA256GCM,
-            MessageDigest.SHA384,
+            MessageDigest.AEAD,
             Protocol.TLSv1_2,
             false,
             EncryptionLevel.HIGH,
@@ -3960,7 +3960,7 @@ public enum Cipher {
             KeyExchange.RSAPSK,
             Authentication.RSA,
             Encryption.ARIA128GCM,
-            MessageDigest.SHA256,
+            MessageDigest.AEAD,
             Protocol.TLSv1_2,
             false,
             EncryptionLevel.HIGH,
@@ -3976,7 +3976,7 @@ public enum Cipher {
             KeyExchange.RSAPSK,
             Authentication.RSA,
             Encryption.ARIA256GCM,
-            MessageDigest.SHA384,
+            MessageDigest.AEAD,
             Protocol.TLSv1_2,
             false,
             EncryptionLevel.HIGH,



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