diff --git a/cmd/config.go b/cmd/config.go index 114e2397d..1a0309094 100644 --- a/cmd/config.go +++ b/cmd/config.go @@ -205,11 +205,8 @@ func (t *TLSConfig) Load(scope prometheus.Registerer) (*tls.Config, error) { ClientCAs: rootCAs, ClientAuth: tls.RequireAndVerifyClientCert, Certificates: []tls.Certificate{cert}, - // Set the only acceptable TLS to v1.2 and v1.3. - MinVersion: tls.VersionTLS12, - MaxVersion: tls.VersionTLS13, - // CipherSuites will be ignored for TLS v1.3. - CipherSuites: []uint16{tls.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305}, + // Set the only acceptable TLS to v1.3. + MinVersion: tls.VersionTLS13, }, nil } diff --git a/grpc/creds/creds.go b/grpc/creds/creds.go index b1d775f0c..31da6e234 100644 --- a/grpc/creds/creds.go +++ b/grpc/creds/creds.go @@ -86,10 +86,7 @@ func (tc *clientTransportCredentials) ServerHandshake(rawConn net.Conn) (net.Con // Info returns information about the transport protocol used func (tc *clientTransportCredentials) Info() credentials.ProtocolInfo { - return credentials.ProtocolInfo{ - SecurityProtocol: "tls", - SecurityVersion: "1.2", // We *only* support TLS 1.2 - } + return credentials.ProtocolInfo{SecurityProtocol: "tls"} } // GetRequestMetadata returns nil, nil since TLS credentials do not have metadata. @@ -217,10 +214,7 @@ func (tc *serverTransportCredentials) ClientHandshake(ctx context.Context, addr // Info provides the ProtocolInfo of this TransportCredentials. func (tc *serverTransportCredentials) Info() credentials.ProtocolInfo { - return credentials.ProtocolInfo{ - SecurityProtocol: "tls", - SecurityVersion: "1.2", // We *only* support TLS 1.2 - } + return credentials.ProtocolInfo{SecurityProtocol: "tls"} } // GetRequestMetadata returns nil, nil since TLS credentials do not have metadata.