diff options
| author | Tim Potter <tpot@hpe.com> | 2017-03-29 15:40:29 +1100 |
|---|---|---|
| committer | Tim Potter <tpot@hpe.com> | 2017-03-29 15:40:29 +1100 |
| commit | fd893c7eb806dc92ad94487ef577e73574436c80 (patch) | |
| tree | b336d8573cccfb9cccc76aded5b79a0f917d4fef | |
| parent | cc6cd82e56351b62663c108921fd44c2285cd73c (diff) | |
New upstream version 0.2.1+git20170204.13.ecb4cb2
| -rw-r--r-- | tlsconfig/certpool_go17.go | 2 | ||||
| -rw-r--r-- | tlsconfig/config.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tlsconfig/certpool_go17.go b/tlsconfig/certpool_go17.go index 352d342..1d5fa4c 100644 --- a/tlsconfig/certpool_go17.go +++ b/tlsconfig/certpool_go17.go @@ -14,7 +14,7 @@ import ( func SystemCertPool() (*x509.CertPool, error) { certpool, err := x509.SystemCertPool() if err != nil && runtime.GOOS == "windows" { - logrus.Warnf("Unable to use system certificate pool: %v", err) + logrus.Infof("Unable to use system certificate pool: %v", err) return x509.NewCertPool(), nil } return certpool, err diff --git a/tlsconfig/config.go b/tlsconfig/config.go index 8bbffcf..44733ff 100644 --- 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 |