From 96a09450f5458a31a2cf50d4c083df9d84c5987f Mon Sep 17 00:00:00 2001 From: Fernandez Ludovic Date: Thu, 8 Sep 2022 10:31:13 +0200 Subject: [PATCH] review --- docs/content/deprecation/features.md | 5 ++--- pkg/tls/tlsmanager.go | 4 ++-- pkg/tls/tlsmanager_test.go | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/docs/content/deprecation/features.md b/docs/content/deprecation/features.md index c1ecb49938..cd468a2583 100644 --- a/docs/content/deprecation/features.md +++ b/docs/content/deprecation/features.md @@ -7,7 +7,7 @@ This page is maintained and updated periodically to reflect our roadmap and any | [Pilot Dashboard (Metrics)](#pilot-dashboard-metrics) | 2.7 | 2.8 | 3.0 | | [Pilot Plugins](#pilot-plugins) | 2.7 | 2.8 | 3.0 | | [Consul Enterprise Namespace](#consul-enterprise-namespace) | 2.8 | N/A | 3.0 | -| [TLS 1.0 and 1.1 Support](#tls-10-and-11) | 2.8 | 2.9 | TBD | +| [TLS 1.0 and 1.1 Support](#tls-10-and-11) | - | 2.8 | TBD | ## Impact @@ -28,5 +28,4 @@ please use the `namespaces` options instead. ### TLS 1.0 and 1.1 -Starting on 2.7 the default TLS options will use the minimum version of TLS 1.2. Of course it can still be overridden with custom configuration. -In 2.8, a warning log will be presented for client connections attempting to use deprecated TLS versions. +Starting on 2.7 the default TLS options will use the minimum version of TLS 1.2. Of course, it can still be overridden with custom configuration. diff --git a/pkg/tls/tlsmanager.go b/pkg/tls/tlsmanager.go index 3931f5c014..73b98fc63b 100644 --- a/pkg/tls/tlsmanager.go +++ b/pkg/tls/tlsmanager.go @@ -28,10 +28,10 @@ var DefaultTLSOptions = Options{ // ensure http2 enabled ALPNProtocols: []string{"h2", "http/1.1", tlsalpn01.ACMETLS1Protocol}, MinVersion: "VersionTLS12", - CipherSuites: goSecureCiphers(), + CipherSuites: getCipherSuites(), } -func goSecureCiphers() []string { +func getCipherSuites() []string { gsc := tls.CipherSuites() ciphers := make([]string, len(gsc)) for idx, cs := range gsc { diff --git a/pkg/tls/tlsmanager_test.go b/pkg/tls/tlsmanager_test.go index 988fd6e7ca..7f38532995 100644 --- a/pkg/tls/tlsmanager_test.go +++ b/pkg/tls/tlsmanager_test.go @@ -348,7 +348,7 @@ func TestClientAuth(t *testing.T) { } } -func TestManager_DefaultValues(t *testing.T) { +func TestManager_Get_DefaultValues(t *testing.T) { tlsManager := NewManager() // Ensures we won't break things for Traefik users when updating Go