Skip to content

Commit 166fd33

Browse files
client: clean up the tls config for client (#8347)
ref #4399 Signed-off-by: Ryan Leung <[email protected]> Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com>
1 parent a7f2632 commit 166fd33

File tree

1 file changed

+0
-12
lines changed

1 file changed

+0
-12
lines changed

Diff for: client/tlsutil/tlsconfig.go

-12
Original file line numberDiff line numberDiff line change
@@ -47,21 +47,12 @@ import (
4747
type TLSInfo struct {
4848
CertFile string
4949
KeyFile string
50-
CAFile string // TODO: deprecate this in v4
5150
TrustedCAFile string
52-
ClientCertAuth bool
53-
CRLFile string
5451
InsecureSkipVerify bool
5552

56-
SkipClientSANVerify bool
57-
5853
// ServerName ensures the cert matches the given host in case of discovery / virtual hosting
5954
ServerName string
6055

61-
// HandshakeFailure is optionally called when a connection fails to handshake. The
62-
// connection will be closed immediately afterwards.
63-
HandshakeFailure func(*tls.Conn, error)
64-
6556
// CipherSuites is a list of supported cipher suites.
6657
// If empty, Go auto-populates it by default.
6758
// Note that cipher suites are prioritized in the given order.
@@ -157,9 +148,6 @@ func (info TLSInfo) baseConfig() (*tls.Config, error) {
157148
// cafiles returns a list of CA file paths.
158149
func (info TLSInfo) cafiles() []string {
159150
cs := make([]string, 0)
160-
if info.CAFile != "" {
161-
cs = append(cs, info.CAFile)
162-
}
163151
if info.TrustedCAFile != "" {
164152
cs = append(cs, info.TrustedCAFile)
165153
}

0 commit comments

Comments
 (0)