crypto/tls: add correct names for CHACHA20_POLY1305 cipher suite constants

The cipher suites were apparently renamed late in the standardization
process, and we picked up the legacy name. We can't remove the old
constants, but add correctly named ones.

Fixes #32061

Change-Id: I65ee25c12c10934391af88b76b18565da67453fa
Reviewed-on: https://go-review.googlesource.com/c/go/+/205068
Run-TryBot: Filippo Valsorda <filippo@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Adam Langley <agl@golang.org>

diff --git a/src/crypto/tls/cipher_suites.go b/src/crypto/tls/cipher_suites.go
index 9289a592b9084c821ee0862caaf7fc8a0c3d8f00..80e4023a7fe434c63a4170dcf1cf525c47561f0d 100644 (file)
--- a/src/crypto/tls/cipher_suites.go
+++ b/src/crypto/tls/cipher_suites.go
@@ -405,31 +405,31 @@ func cipherSuiteTLS13ByID(id uint16) *cipherSuiteTLS13 {
 // A list of cipher suite IDs that are, or have been, implemented by this
 // package.
 //
-// Taken from https://www.iana.org/assignments/tls-parameters/tls-parameters.xml
+// See https://www.iana.org/assignments/tls-parameters/tls-parameters.xml
 const (
        // TLS 1.0 - 1.2 cipher suites.
-       TLS_RSA_WITH_RC4_128_SHA                uint16 = 0x0005
-       TLS_RSA_WITH_3DES_EDE_CBC_SHA           uint16 = 0x000a
-       TLS_RSA_WITH_AES_128_CBC_SHA            uint16 = 0x002f
-       TLS_RSA_WITH_AES_256_CBC_SHA            uint16 = 0x0035
-       TLS_RSA_WITH_AES_128_CBC_SHA256         uint16 = 0x003c
-       TLS_RSA_WITH_AES_128_GCM_SHA256         uint16 = 0x009c
-       TLS_RSA_WITH_AES_256_GCM_SHA384         uint16 = 0x009d
-       TLS_ECDHE_ECDSA_WITH_RC4_128_SHA        uint16 = 0xc007
-       TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA    uint16 = 0xc009
-       TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA    uint16 = 0xc00a
-       TLS_ECDHE_RSA_WITH_RC4_128_SHA          uint16 = 0xc011
-       TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA     uint16 = 0xc012
-       TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA      uint16 = 0xc013
-       TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA      uint16 = 0xc014
-       TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256 uint16 = 0xc023
-       TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256   uint16 = 0xc027
-       TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256   uint16 = 0xc02f
-       TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 uint16 = 0xc02b
-       TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384   uint16 = 0xc030
-       TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384 uint16 = 0xc02c
-       TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305    uint16 = 0xcca8
-       TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305  uint16 = 0xcca9
+       TLS_RSA_WITH_RC4_128_SHA                      uint16 = 0x0005
+       TLS_RSA_WITH_3DES_EDE_CBC_SHA                 uint16 = 0x000a
+       TLS_RSA_WITH_AES_128_CBC_SHA                  uint16 = 0x002f
+       TLS_RSA_WITH_AES_256_CBC_SHA                  uint16 = 0x0035
+       TLS_RSA_WITH_AES_128_CBC_SHA256               uint16 = 0x003c
+       TLS_RSA_WITH_AES_128_GCM_SHA256               uint16 = 0x009c
+       TLS_RSA_WITH_AES_256_GCM_SHA384               uint16 = 0x009d
+       TLS_ECDHE_ECDSA_WITH_RC4_128_SHA              uint16 = 0xc007
+       TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA          uint16 = 0xc009
+       TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA          uint16 = 0xc00a
+       TLS_ECDHE_RSA_WITH_RC4_128_SHA                uint16 = 0xc011
+       TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA           uint16 = 0xc012
+       TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA            uint16 = 0xc013
+       TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA            uint16 = 0xc014
+       TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256       uint16 = 0xc023
+       TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256         uint16 = 0xc027
+       TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256         uint16 = 0xc02f
+       TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256       uint16 = 0xc02b
+       TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384         uint16 = 0xc030
+       TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384       uint16 = 0xc02c
+       TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256   uint16 = 0xcca8
+       TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256 uint16 = 0xcca9
 
        // TLS 1.3 cipher suites.
        TLS_AES_128_GCM_SHA256       uint16 = 0x1301
@@ -439,4 +439,9 @@ const (
        // TLS_FALLBACK_SCSV isn't a standard cipher suite but an indicator
        // that the client is doing version fallback. See RFC 7507.
        TLS_FALLBACK_SCSV uint16 = 0x5600
+
+       // Legacy names for the corresponding cipher suites with the correct _SHA256
+       // suffix, retained for backward compatibility.
+       TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305   = TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256
+       TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305 = TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256
 )