Author: markt
Date: Thu Dec 17 15:27:50 2015
New Revision: 1720603
URL: http://svn.apache.org/viewvc?rev=1720603&view=rev
Log:
Add the draft names to the list of registered names
Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TestCipher.java
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=1720603&r1=1720602&r2=1720603&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:27:50 2015
@@ -1055,6 +1055,14 @@ public class TestCipher {
"TLS_ECDHE_ECDSA_WITH_AES_128_CCM",
"TLS_ECDHE_ECDSA_WITH_AES_256_CCM",
"TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8",
- "TLS_ECDHE_ECDSA_WITH_AES_256_CCM_8")));
-
+ "TLS_ECDHE_ECDSA_WITH_AES_256_CCM_8",
+ // From
https://tools.ietf.org/html/draft-ietf-tls-chacha20-poly1305-04
+ // These might change.
+ "TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256",
+ "TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256",
+ "TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256",
+ "TLS_PSK_WITH_CHACHA20_POLY1305_SHA256",
+ "TLS_ECDHE_PSK_WITH_CHACHA20_POLY1305_SHA256",
+ "TLS_DHE_PSK_WITH_CHACHA20_POLY1305_SHA256",
+ "TLS_RSA_PSK_WITH_CHACHA20_POLY1305_SHA256")));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
