2015-12-17 18:30 GMT+03:00 <ma...@apache.org>:
> Author: markt
> Date: Thu Dec 17 15:30:11 2015
> New Revision: 1720604
>
> URL: http://svn.apache.org/viewvc?rev=1720604&view=rev
> Log:
> Align cipher names with proposed names for registry
>
> 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=1720604&r1=1720603&r2=1720604&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:30:11 2015
> @@ -4324,7 +4324,7 @@ public enum Cipher {
> null
> ),
> // draft-ietf-tl\s-chacha20-poly1305-03
Regarding the above comment:
1) A typo ('tl\s')
2) It would be better with working URL to ietf site, like you wrote in
TestCipher in r1720603:
>> + // From
>> https://tools.ietf.org/html/draft-ietf-tls-chacha20-poly1305-04
>> + // These might change.
3) The above comment says "-03" that is version 03 of the draft, but
the URL in TestCipher says -04, version 04.
I wonder why the difference.
This is why I think an URL is better.
> - TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305(
> + TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256(
> 0xCCA8,
> "ECDHE-RSA-CHACHA20-POLY1305",
> KeyExchange.EECDH,
> @@ -4340,7 +4340,7 @@ public enum Cipher {
> null,
> null
> ),
> - TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305(
> + TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256(
> 0xCCA9,
> "ECDHE-ECDSA-CHACHA20-POLY1305",
> KeyExchange.EECDH,
> @@ -4356,7 +4356,7 @@ public enum Cipher {
> null,
> null
> ),
> - TLS_DHE_RSA_WITH_CHACHA20_POLY1305(
> + TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256(
> 0xCCAA,
> "DHE-RSA-CHACHA20-POLY1305",
> KeyExchange.EDH,
> @@ -4372,7 +4372,7 @@ public enum Cipher {
> null,
> null
> ),
> - TLS_PSK_WITH_CHACHA20_POLY1305(
> + TLS_PSK_WITH_CHACHA20_POLY1305_SHA256(
> 0xCCAB,
> "PSK-CHACHA20-POLY1305",
> KeyExchange.PSK,
> @@ -4388,7 +4388,7 @@ public enum Cipher {
> null,
> null
> ),
> - TLS_ECDHE_PSK_WITH_CHACHA20_POLY1305(
> + TLS_ECDHE_PSK_WITH_CHACHA20_POLY1305_SHA256(
> 0xCCAC,
> "ECDHE-PSK-CHACHA20-POLY1305",
> KeyExchange.ECDHEPSK,
> @@ -4404,7 +4404,7 @@ public enum Cipher {
> null,
> null
> ),
> - TLS_DHE_PSK_WITH_CHACHA20_POLY1305(
> + TLS_DHE_PSK_WITH_CHACHA20_POLY1305_SHA256(
> 0xCCAD,
> "DHE-PSK-CHACHA20-POLY1305",
> KeyExchange.DHEPSK,
> @@ -4420,7 +4420,7 @@ public enum Cipher {
> null,
> null
> ),
> - TLS_RSA_PSK_WITH_CHACHA20_POLY1305(
> + TLS_RSA_PSK_WITH_CHACHA20_POLY1305_SHA256(
> 0xCCAE,
> "RSA-PSK-CHACHA20-POLY1305",
> KeyExchange.RSAPSK,
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
