Ensure nil is passed to client.NewServer instead of an empty tlsConfig struct

Johan Thomsen · Johan Thomsen · commit aa36ac41cf52 · 2019-01-30T21:24:59.000+01:00
diff --git a/cert/cert.go b/cert/cert.go
@@ -42,7 +42,7 @@ type CA struct {
 }
 
 func (ca *CA) getRemoteCert() ([]byte, error) {
-	var tlsConfig tls.Config
+	var tlsConfig *tls.Config
 	if ca.RootCACert != "" {
 		rootCABytes, err := ioutil.ReadFile(ca.RootCACert)
 		if err != nil {
@@ -54,12 +54,12 @@ func (ca *CA) getRemoteCert() ([]byte, error) {
 		if !ok {
 			return nil, errors.New("failed to parse rootCA certs")
 		}
-		tlsConfig = tls.Config{
+		tlsConfig = &tls.Config{
 			RootCAs: rootCaCertPool,
 		}
 	}
 
-	remote := client.NewServerTLS(ca.Remote, &tlsConfig)
+	remote := client.NewServerTLS(ca.Remote, tlsConfig)
 	infoReq := &info.Req{
 		Label:   ca.Label,
 		Profile: ca.Profile,

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ type CA struct {`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`func (ca *CA) getRemoteCert() ([]byte, error) {`
`45`		`- var tlsConfig tls.Config`
	`45`	`+ var tlsConfig *tls.Config`
`46`	`46`	`if ca.RootCACert != "" {`
`47`	`47`	`rootCABytes, err := ioutil.ReadFile(ca.RootCACert)`
`48`	`48`	`if err != nil {`
`@@ -54,12 +54,12 @@ func (ca *CA) getRemoteCert() ([]byte, error) {`
`54`	`54`	`if !ok {`
`55`	`55`	`return nil, errors.New("failed to parse rootCA certs")`
`56`	`56`	`}`
`57`		`- tlsConfig = tls.Config{`
	`57`	`+ tlsConfig = &tls.Config{`
`58`	`58`	`RootCAs: rootCaCertPool,`
`59`	`59`	`}`
`60`	`60`	`}`
`61`	`61`
`62`		`- remote := client.NewServerTLS(ca.Remote, &tlsConfig)`
	`62`	`+ remote := client.NewServerTLS(ca.Remote, tlsConfig)`
`63`	`63`	`infoReq := &info.Req{`
`64`	`64`	`Label: ca.Label,`
`65`	`65`	`Profile: ca.Profile,`