From 101653e5e8c62284131007f69e51d61719f6a61c Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Tue, 23 Jun 2020 15:06:20 -0400 Subject: [PATCH] go1.14: add new ciphers --- .../src/k8s.io/component-base/cli/flag/ciphersuites_flag.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/staging/src/k8s.io/component-base/cli/flag/ciphersuites_flag.go b/staging/src/k8s.io/component-base/cli/flag/ciphersuites_flag.go index a52faf91975..923faed30c1 100644 --- a/staging/src/k8s.io/component-base/cli/flag/ciphersuites_flag.go +++ b/staging/src/k8s.io/component-base/cli/flag/ciphersuites_flag.go @@ -46,6 +46,10 @@ var ciphers = map[string]uint16{ "TLS_AES_128_GCM_SHA256": tls.TLS_AES_128_GCM_SHA256, "TLS_CHACHA20_POLY1305_SHA256": tls.TLS_CHACHA20_POLY1305_SHA256, "TLS_AES_256_GCM_SHA384": tls.TLS_AES_256_GCM_SHA384, + + // support official IANA names as well + "TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256": tls.TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256, + "TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256": tls.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256, } // to be replaced by tls.InsecureCipherSuites() when the project migrates to go1.14.