Author: markt
Date: Thu Dec 17 15:20:04 2015
New Revision: 1720602
URL: http://svn.apache.org/viewvc?rev=1720602&view=rev
Log:
New ciphers added to OpenSSL master
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/Cipher.java
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/Encryption.java
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestCipher.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=1720602&r1=1720601&r2=1720602&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
Thu Dec 17 15:20:04 2015
@@ -4323,6 +4323,119 @@ public enum Cipher {
null,
null
),
+ // draft-ietf-tl\s-chacha20-poly1305-03
+ TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305(
+ 0xCCA8,
+ "ECDHE-RSA-CHACHA20-POLY1305",
+ KeyExchange.EECDH,
+ Authentication.RSA,
+ Encryption.CHACHA20POLY1305,
+ MessageDigest.AEAD,
+ Protocol.TLSv1_2,
+ false,
+ EncryptionLevel.HIGH,
+ false,
+ 256,
+ 256,
+ null,
+ null
+ ),
+ TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305(
+ 0xCCA9,
+ "ECDHE-ECDSA-CHACHA20-POLY1305",
+ KeyExchange.EECDH,
+ Authentication.ECDSA,
+ Encryption.CHACHA20POLY1305,
+ MessageDigest.AEAD,
+ Protocol.TLSv1_2,
+ false,
+ EncryptionLevel.HIGH,
+ false,
+ 256,
+ 256,
+ null,
+ null
+ ),
+ TLS_DHE_RSA_WITH_CHACHA20_POLY1305(
+ 0xCCAA,
+ "DHE-RSA-CHACHA20-POLY1305",
+ KeyExchange.EDH,
+ Authentication.RSA,
+ Encryption.CHACHA20POLY1305,
+ MessageDigest.AEAD,
+ Protocol.TLSv1_2,
+ false,
+ EncryptionLevel.HIGH,
+ false,
+ 256,
+ 256,
+ null,
+ null
+ ),
+ TLS_PSK_WITH_CHACHA20_POLY1305(
+ 0xCCAB,
+ "PSK-CHACHA20-POLY1305",
+ KeyExchange.PSK,
+ Authentication.PSK,
+ Encryption.CHACHA20POLY1305,
+ MessageDigest.AEAD,
+ Protocol.TLSv1_2,
+ false,
+ EncryptionLevel.HIGH,
+ false,
+ 256,
+ 256,
+ null,
+ null
+ ),
+ TLS_ECDHE_PSK_WITH_CHACHA20_POLY1305(
+ 0xCCAC,
+ "ECDHE-PSK-CHACHA20-POLY1305",
+ KeyExchange.ECDHEPSK,
+ Authentication.PSK,
+ Encryption.CHACHA20POLY1305,
+ MessageDigest.AEAD,
+ Protocol.TLSv1_2,
+ false,
+ EncryptionLevel.HIGH,
+ false,
+ 256,
+ 256,
+ null,
+ null
+ ),
+ TLS_DHE_PSK_WITH_CHACHA20_POLY1305(
+ 0xCCAD,
+ "DHE-PSK-CHACHA20-POLY1305",
+ KeyExchange.DHEPSK,
+ Authentication.PSK,
+ Encryption.CHACHA20POLY1305,
+ MessageDigest.AEAD,
+ Protocol.TLSv1_2,
+ false,
+ EncryptionLevel.HIGH,
+ false,
+ 256,
+ 256,
+ null,
+ null
+ ),
+ TLS_RSA_PSK_WITH_CHACHA20_POLY1305(
+ 0xCCAE,
+ "RSA-PSK-CHACHA20-POLY1305",
+ KeyExchange.RSAPSK,
+ Authentication.RSA,
+ Encryption.CHACHA20POLY1305,
+ MessageDigest.AEAD,
+ Protocol.TLSv1_2,
+ false,
+ EncryptionLevel.HIGH,
+ false,
+ 256,
+ 256,
+ null,
+ null
+ ),
// Cipher 0x010080 (SSLv2)
// RC4_128_WITH_MD5
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/Encryption.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/Encryption.java?rev=1720602&r1=1720601&r2=1720602&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/Encryption.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/ciphers/Encryption.java
Thu Dec 17 15:20:04 2015
@@ -28,6 +28,7 @@ enum Encryption {
AES256GCM,
CAMELLIA256,
CAMELLIA128,
+ CHACHA20POLY1305,
TRIPLE_DES,
DES,
IDEA,
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestCipher.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestCipher.java?rev=1720602&r1=1720601&r2=1720602&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestCipher.java
(original)
+++
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestCipher.java
Thu Dec 17 15:20:04 2015
@@ -370,10 +370,12 @@ public class TestCipher {
"DHE-PSK-AES256-CCM8+TLSv1.2",
"DHE-PSK-CAMELLIA128-SHA256+TLSv1.0",
"DHE-PSK-CAMELLIA256-SHA384+TLSv1.0",
+ "DHE-PSK-CHACHA20-POLY1305+TLSv1.2",
"DHE-RSA-AES128-CCM+TLSv1.2",
"DHE-RSA-AES128-CCM8+TLSv1.2",
"DHE-RSA-AES256-CCM+TLSv1.2",
"DHE-RSA-AES256-CCM8+TLSv1.2",
+ "DHE-RSA-CHACHA20-POLY1305+TLSv1.2",
"ECDH-ECDSA-CAMELLIA128-SHA256+TLSv1.2",
"ECDH-ECDSA-CAMELLIA256-SHA384+TLSv1.2",
"ECDH-RSA-CAMELLIA128-SHA256+TLSv1.2",
@@ -384,10 +386,13 @@ public class TestCipher {
"ECDHE-ECDSA-AES256-CCM8+TLSv1.2",
"ECDHE-ECDSA-CAMELLIA128-SHA256+TLSv1.2",
"ECDHE-ECDSA-CAMELLIA256-SHA384+TLSv1.2",
+ "ECDHE-ECDSA-CHACHA20-POLY1305+TLSv1.2",
"ECDHE-PSK-CAMELLIA128-SHA256+TLSv1.0",
"ECDHE-PSK-CAMELLIA256-SHA384+TLSv1.0",
+ "ECDHE-PSK-CHACHA20-POLY1305+TLSv1.2",
"ECDHE-RSA-CAMELLIA128-SHA256+TLSv1.2",
"ECDHE-RSA-CAMELLIA256-SHA384+TLSv1.2",
+ "ECDHE-RSA-CHACHA20-POLY1305+TLSv1.2",
"EXP-RC2-CBC-MD5+SSLv2",
"EXP-RC4-MD5+SSLv2",
"IDEA-CBC-MD5+SSLv2",
@@ -397,10 +402,12 @@ public class TestCipher {
"PSK-AES256-CCM8+TLSv1.2",
"PSK-CAMELLIA128-SHA256+TLSv1.0",
"PSK-CAMELLIA256-SHA384+TLSv1.0",
+ "PSK-CHACHA20-POLY1305+TLSv1.2",
"RC2-CBC-MD5+SSLv2",
"RC4-MD5+SSLv2",
"RSA-PSK-CAMELLIA128-SHA256+TLSv1.0",
- "RSA-PSK-CAMELLIA256-SHA384+TLSv1.0")));
+ "RSA-PSK-CAMELLIA256-SHA384+TLSv1.0",
+ "RSA-PSK-CHACHA20-POLY1305+TLSv1.2")));
/**
@@ -596,6 +603,7 @@ public class TestCipher {
"DHE-PSK-AES256-GCM-SHA384+TLSv1.2",
"DHE-PSK-CAMELLIA128-SHA256+TLSv1.0",
"DHE-PSK-CAMELLIA256-SHA384+TLSv1.0",
+ "DHE-PSK-CHACHA20-POLY1305+TLSv1.2",
"DHE-PSK-NULL-SHA+SSLv3",
"DHE-PSK-NULL-SHA256+TLSv1.0",
"DHE-PSK-NULL-SHA384+TLSv1.0",
@@ -608,6 +616,7 @@ public class TestCipher {
"DHE-RSA-CAMELLIA128-SHA256+TLSv1.2",
"DHE-RSA-CAMELLIA256-SHA+SSLv3",
"DHE-RSA-CAMELLIA256-SHA256+TLSv1.2",
+ "DHE-RSA-CHACHA20-POLY1305+TLSv1.2",
"DHE-RSA-SEED-SHA+SSLv3",
"ECDH-ECDSA-CAMELLIA128-SHA256+TLSv1.2",
"ECDH-ECDSA-CAMELLIA256-SHA384+TLSv1.2",
@@ -619,6 +628,7 @@ public class TestCipher {
"ECDHE-ECDSA-AES256-CCM8+TLSv1.2",
"ECDHE-ECDSA-CAMELLIA128-SHA256+TLSv1.2",
"ECDHE-ECDSA-CAMELLIA256-SHA384+TLSv1.2",
+ "ECDHE-ECDSA-CHACHA20-POLY1305+TLSv1.2",
"ECDHE-PSK-3DES-EDE-CBC-SHA+SSLv3",
"ECDHE-PSK-AES128-CBC-SHA+SSLv3",
"ECDHE-PSK-AES128-CBC-SHA256+TLSv1.0",
@@ -626,12 +636,14 @@ public class TestCipher {
"ECDHE-PSK-AES256-CBC-SHA384+TLSv1.0",
"ECDHE-PSK-CAMELLIA128-SHA256+TLSv1.0",
"ECDHE-PSK-CAMELLIA256-SHA384+TLSv1.0",
+ "ECDHE-PSK-CHACHA20-POLY1305+TLSv1.2",
"ECDHE-PSK-NULL-SHA+SSLv3",
"ECDHE-PSK-NULL-SHA256+TLSv1.0",
"ECDHE-PSK-NULL-SHA384+TLSv1.0",
"ECDHE-PSK-RC4-SHA+SSLv3",
"ECDHE-RSA-CAMELLIA128-SHA256+TLSv1.2",
"ECDHE-RSA-CAMELLIA256-SHA384+TLSv1.2",
+ "ECDHE-RSA-CHACHA20-POLY1305+TLSv1.2",
"EXP-DH-DSS-DES-CBC-SHA+SSLv3",
"EXP-DH-RSA-DES-CBC-SHA+SSLv3",
"EXP-RC2-CBC-MD5+SSLv2",
@@ -651,6 +663,7 @@ public class TestCipher {
"PSK-AES256-GCM-SHA384+TLSv1.2",
"PSK-CAMELLIA128-SHA256+TLSv1.0",
"PSK-CAMELLIA256-SHA384+TLSv1.0",
+ "PSK-CHACHA20-POLY1305+TLSv1.2",
"PSK-NULL-SHA+SSLv3",
"PSK-NULL-SHA256+TLSv1.0",
"PSK-NULL-SHA384+TLSv1.0",
@@ -666,6 +679,7 @@ public class TestCipher {
"RSA-PSK-AES256-GCM-SHA384+TLSv1.2",
"RSA-PSK-CAMELLIA128-SHA256+TLSv1.0",
"RSA-PSK-CAMELLIA256-SHA384+TLSv1.0",
+ "RSA-PSK-CHACHA20-POLY1305+TLSv1.2",
"RSA-PSK-NULL-SHA+SSLv3",
"RSA-PSK-NULL-SHA256+TLSv1.0",
"RSA-PSK-NULL-SHA384+TLSv1.0",
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
