Skip to content

Commit 34226de

Browse files
authored
Add support for TLS 1.3 ciphers. (kubernetes#90843)
1 parent 9fce6b7 commit 34226de

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

staging/src/k8s.io/component-base/cli/flag/ciphersuites_flag.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@ var ciphers = map[string]uint16{
4848
"TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384": tls.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
4949
"TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305": tls.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,
5050
"TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305": tls.TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,
51+
"TLS_AES_128_GCM_SHA256": tls.TLS_AES_128_GCM_SHA256,
52+
"TLS_CHACHA20_POLY1305_SHA256": tls.TLS_CHACHA20_POLY1305_SHA256,
53+
"TLS_AES_256_GCM_SHA384": tls.TLS_AES_256_GCM_SHA384,
5154
}
5255

5356
func TLSCipherPossibleValues() []string {

staging/src/k8s.io/component-base/cli/flag/ciphersuites_flag_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,8 @@ func TestConstantMaps(t *testing.T) {
8686
if strings.HasPrefix(declName, "VersionTLS") {
8787
discoveredVersions[declName] = true
8888
}
89-
if strings.HasPrefix(declName, "TLS_RSA_") || strings.HasPrefix(declName, "TLS_ECDHE_") {
89+
if strings.HasPrefix(declName, "TLS_RSA_") || strings.HasPrefix(declName, "TLS_ECDHE_") ||
90+
strings.HasPrefix(declName, "TLS_AES_") || strings.HasPrefix(declName, "TLS_CHACHA20_") {
9091
discoveredCiphers[declName] = true
9192
}
9293
}

0 commit comments

Comments
 (0)