From 994a22f4c2532ca24eb2f4fa9b1f3f137967053f Mon Sep 17 00:00:00 2001 From: Kyle Brandt Date: Thu, 3 Mar 2022 11:48:26 -0500 Subject: [PATCH] Chore: Remove deprecated no-op option PreferServerCipherSuites (#46174) * Chore: Remove deprecated no-op option PreferServerCipherSuites from the tls configs. Per golang docs: "PreferServerCipherSuites is a legacy field and has no effect." --- pkg/api/http_server.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkg/api/http_server.go b/pkg/api/http_server.go index ff64c079f33..db2a4691ea1 100644 --- a/pkg/api/http_server.go +++ b/pkg/api/http_server.go @@ -383,8 +383,7 @@ func (hs *HTTPServer) configureHttps() error { } tlsCfg := &tls.Config{ - MinVersion: tls.VersionTLS12, - PreferServerCipherSuites: true, + MinVersion: tls.VersionTLS12, CipherSuites: []uint16{ tls.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256, tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256, @@ -424,8 +423,7 @@ func (hs *HTTPServer) configureHttp2() error { } tlsCfg := &tls.Config{ - MinVersion: tls.VersionTLS12, - PreferServerCipherSuites: true, + MinVersion: tls.VersionTLS12, CipherSuites: []uint16{ tls.TLS_CHACHA20_POLY1305_SHA256, tls.TLS_AES_128_GCM_SHA256,