Author: markt
Date: Fri Jun 26 10:53:42 2015
New Revision: 1687748
URL: http://svn.apache.org/r1687748
Log:
OpenSSL added ciphers 0x00A8 and 0x00A9
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=1687748&r1=1687747&r2=1687748&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 Fri
Jun 26 10:53:42 2015
@@ -1808,8 +1808,38 @@ public enum Cipher {
256,
256
),
+ // Cipher A8
+ TLS_PSK_WITH_AES_128_GCM_SHA256(
+ 0x00A8,
+ "PSK-AES128-GCM-SHA256",
+ KeyExchange.PSK,
+ Authentication.PSK,
+ Encryption.AES128GCM,
+ MessageDigest.AEAD,
+ Protocol.TLSv1_2,
+ false,
+ EncryptionLevel.HIGH,
+ true,
+ 128,
+ 128
+ ),
+ // Cipher A9
+ TLS_PSK_WITH_AES_256_GCM_SHA384(
+ 0x00A9,
+ "PSK-AES128-GCM-SHA384",
+ KeyExchange.PSK,
+ Authentication.PSK,
+ Encryption.AES256GCM,
+ MessageDigest.AEAD,
+ Protocol.TLSv1_2,
+ false,
+ EncryptionLevel.HIGH,
+ true,
+ 256,
+ 256
+ ),
- /* PSK ciphers 0x00A8 to 0x00B9
+ /* PSK ciphers 0x00AA to 0x00B9
* Unsupported by both Java and OpenSSL
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
