Merge pull request #2322 from influxdata/feat/tls13

Add TLS1.3 support
influxdata · Apr 21, 2020 · 28b69c1 · 28b69c1
2 parents 1a9d398 + 1432b0b
commit 28b69c1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,8 @@
 
 ### Features
 
+- [#2318](https://github.com/influxdata/kapacitor/pull/2322): Add support for TLS 1.3.
+
 ### Bugfixes
 
 ## v1.5.5 [2020-04-20]

diff --git a/tlsconfig/config.go b/tlsconfig/config.go
@@ -125,6 +125,11 @@ var ciphersMap = map[string]uint16{
 	"TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384": tls.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
 	"TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305":    tls.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,
 	"TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305":  tls.TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,
+
+	// TLS1.3 cypher suites
+	"TLS_AES_128_GCM_SHA256":       tls.TLS_AES_128_GCM_SHA256,
+	"TLS_AES_256_GCM_SHA384":       tls.TLS_AES_256_GCM_SHA384,
+	"TLS_CHACHA20_POLY1305_SHA256": tls.TLS_CHACHA20_POLY1305_SHA256,
 }
 
 func unknownCipher(name string) error {
@@ -146,6 +151,8 @@ var versionsMap = map[string]uint16{
 	"1.1":    tls.VersionTLS11,
 	"TLS1.2": tls.VersionTLS12,
 	"1.2":    tls.VersionTLS12,
+	"TLS1.3": tls.VersionTLS13,
+	"1.3":    tls.VersionTLS13,
 }
 
 func unknownVersion(name string) error {