Skip to content

Commit

Permalink
review
Browse files Browse the repository at this point in the history
  • Loading branch information
ldez committed Sep 8, 2022
1 parent 0816c8f commit 96a0945
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
5 changes: 2 additions & 3 deletions docs/content/deprecation/features.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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.
4 changes: 2 additions & 2 deletions pkg/tls/tlsmanager.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion pkg/tls/tlsmanager_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 96a0945

Please sign in to comment.