Revert change for windows cert pool access in 1.8

The upstream change to allow access to the windows system cert pool was reverted, reverting and updating messaging. Maybe 1.9....golang/go#18609 Signed-off-by: Derek McGowan <[email protected]> (github: dmcgowan)
dmcgowan · Feb 3, 2017 · 6f510e0 · 6f510e0
1 parent c972f11
commit 6f510e0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 12 deletions.
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
 
@@ -14,7 +14,7 @@ import (
 func SystemCertPool() (*x509.CertPool, error) {
 	certpool, err := x509.SystemCertPool()
 	if err != nil && runtime.GOOS == "windows" {
-		logrus.Infof("Unable to use system certificate pool: %v", err)
+		logrus.Infof("Unable to use system certificate pool with custom certificate pool: %v", err)
 		return x509.NewCertPool(), nil
 	}
 	return certpool, err

diff --git a/tlsconfig/certpool_go18.go b/tlsconfig/certpool_go18.go