Merge pull request docker#29 from dmcgowan/revert-windows-go-18-system-pool

thaJeztah · web-flow · commit 7da10c8c50ca · 2017-02-03T15:56:24.000-08:00
Revert change for windows cert pool access in 1.8
diff --git a/tlsconfig/certpool_go17.go b/tlsconfig/certpool_go17.go
@@ -1,4 +1,4 @@
-// +build go1.7,!go1.8
+// +build go1.7
 
 package tlsconfig
 
diff --git a/tlsconfig/certpool_go18.go b/tlsconfig/certpool_go18.go
diff --git a/tlsconfig/config.go b/tlsconfig/config.go
@@ -118,7 +118,7 @@ func Server(options Options) (*tls.Config, error) {
 		return nil, fmt.Errorf("Error reading X509 key pair (cert: %q, key: %q): %v. Make sure the key is not encrypted.", options.CertFile, options.KeyFile, err)
 	}
 	tlsConfig.Certificates = []tls.Certificate{tlsCert}
-	if options.ClientAuth >= tls.VerifyClientCertIfGiven {
+	if options.ClientAuth >= tls.VerifyClientCertIfGiven && options.CAFile != "" {
 		CAs, err := certPool(options.CAFile)
 		if err != nil {
 			return nil, err

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ func Server(options Options) (*tls.Config, error) {`
`118`	`118`	`return nil, fmt.Errorf("Error reading X509 key pair (cert: %q, key: %q): %v. Make sure the key is not encrypted.", options.CertFile, options.KeyFile, err)`
`119`	`119`	`}`
`120`	`120`	`tlsConfig.Certificates = []tls.Certificate{tlsCert}`
`121`		`- if options.ClientAuth >= tls.VerifyClientCertIfGiven {`
	`121`	`+ if options.ClientAuth >= tls.VerifyClientCertIfGiven && options.CAFile != "" {`
`122`	`122`	`CAs, err := certPool(options.CAFile)`
`123`	`123`	`if err != nil {`
`124`	`124`	`return nil, err`