From 96383c1d912d4a4df8066aeb1e012d9f4eebc78e Mon Sep 17 00:00:00 2001 From: Wahab Ali Date: Thu, 4 Feb 2021 07:16:44 +0500 Subject: [PATCH] This is a test commit. DO NOT MERGE. Signed-off-by: Wahab Ali --- internal/tlsutil/tls.go | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/internal/tlsutil/tls.go b/internal/tlsutil/tls.go index 0e398f0e8..989f1df44 100644 --- a/internal/tlsutil/tls.go +++ b/internal/tlsutil/tls.go @@ -20,7 +20,6 @@ import ( "crypto/tls" "crypto/x509" "io/ioutil" - "runtime" "github.com/pkg/errors" ) @@ -60,14 +59,9 @@ func CertPoolFromFile(filename string) (*x509.CertPool, error) { return nil, errors.Errorf("can't read CA file: %v", filename) } - var cp *x509.CertPool - if runtime.GOOS == "windows" { - cp = x509.NewCertPool() - } else { - cp, err = x509.SystemCertPool() - if err != nil { - return nil, errors.Wrap(err, "failed to load system cert pool") - } + cp, err := x509.SystemCertPool() + if err != nil { + return nil, errors.Wrap(err, "failed to load system cert pool") } if !cp.AppendCertsFromPEM(b) {