kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #33814 from vdemeester/update-go-connections

Browse source 
Update go-connections dependency
This commit is contained in:
Brian Goff 2017-06-26 10:24:04 -04:00 committed by GitHub
commit 33fd3817b0
4 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
vendor.conf
View file

@ -17,7 +17,7 @@ github.com/vdemeester/shakers 24d7f1d6a71aa5d9cbe7390e4afb66b7eef9e1b3
golang.org/x/net 7dcfb8076726a3fdd9353b6b8a1f1b6be6811bd6 golang.org/x/net 7dcfb8076726a3fdd9353b6b8a1f1b6be6811bd6
golang.org/x/sys 8f0908ab3b2457e2e15403d3697c9ef5cb4b57a9 golang.org/x/sys 8f0908ab3b2457e2e15403d3697c9ef5cb4b57a9
github.com/docker/go-units 9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1 github.com/docker/go-units 9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1
github.com/docker/go-connections e15c02316c12de00874640cd76311849de2aeed5 github.com/docker/go-connections 3ede32e2033de7505e6500d6c868c2b9ed9f169d
golang.org/x/text f72d8390a633d5dfb0cc84043294db9f6c935756 golang.org/x/text f72d8390a633d5dfb0cc84043294db9f6c935756
github.com/stretchr/testify 4d4bfba8f1d1027c4fdbe371823030df51419987 github.com/stretchr/testify 4d4bfba8f1d1027c4fdbe371823030df51419987
github.com/pmezard/go-difflib v1.0.0 github.com/pmezard/go-difflib v1.0.0

3
vendor/github.com/docker/go-connections/tlsconfig/certpool_go17.go generated vendored
View file

@ -5,8 +5,6 @@ package tlsconfig
import ( import (
"crypto/x509" "crypto/x509"
"runtime" "runtime"
"github.com/Sirupsen/logrus"
) )
// SystemCertPool returns a copy of the system cert pool, // SystemCertPool returns a copy of the system cert pool,
@ -14,7 +12,6 @@ import (
func SystemCertPool() (*x509.CertPool, error) { func SystemCertPool() (*x509.CertPool, error) {
certpool, err := x509.SystemCertPool() certpool, err := x509.SystemCertPool()
if err != nil && runtime.GOOS == "windows" { if err != nil && runtime.GOOS == "windows" {
logrus.Infof("Unable to use system certificate pool: %v", err)
return x509.NewCertPool(), nil return x509.NewCertPool(), nil
} }
return certpool, err return certpool, err

2
vendor/github.com/docker/go-connections/tlsconfig/certpool_other.go generated vendored
View file

@ -5,12 +5,10 @@ package tlsconfig
import ( import (
"crypto/x509" "crypto/x509"
"github.com/Sirupsen/logrus"
) )
// SystemCertPool returns an new empty cert pool, // SystemCertPool returns an new empty cert pool,
// accessing system cert pool is supported in go 1.7 // accessing system cert pool is supported in go 1.7
func SystemCertPool() (*x509.CertPool, error) { func SystemCertPool() (*x509.CertPool, error) {
logrus.Warn("Unable to use system certificate pool: requires building with go 1.7 or later")
return x509.NewCertPool(), nil return x509.NewCertPool(), nil
} }

2
vendor/github.com/docker/go-connections/tlsconfig/config.go generated vendored
View file

@ -13,7 +13,6 @@ import (
"io/ioutil" "io/ioutil"
"os" "os"
"github.com/Sirupsen/logrus"
"github.com/pkg/errors" "github.com/pkg/errors"
) )
@ -106,7 +105,6 @@ func certPool(caFile string, exclusivePool bool) (*x509.CertPool, error) {
if !certPool.AppendCertsFromPEM(pem) { if !certPool.AppendCertsFromPEM(pem) {
return nil, fmt.Errorf("failed to append certificates from PEM file: %q", caFile) return nil, fmt.Errorf("failed to append certificates from PEM file: %q", caFile)
} }
logrus.Debugf("Trusting %d certs", len(certPool.Subjects()))
return certPool, nil return certPool, nil
} }