github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-21 10:09:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #120 from riyazdf/system-pool-fix

Browse Source 
trust: do not call x509.SystemCertPool as nil will use this as default
This commit is contained in:
Justin Cormack 2017-07-14 22:53:24 +01:00 committed by GitHub
commit f035995b22
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/moby/trust.go
View File

@ -194,13 +194,7 @@ func httpsTransport(caFile string) (*http.Transport, error) {
TLSClientConfig: tlsConfig,
}
// Override with the system cert pool if the caFile was empty
if caFile == "" {
systemCertPool, err := x509.SystemCertPool()
if err != nil {
return nil, err
}
transport.TLSClientConfig.RootCAs = systemCertPool
} else {
if caFile != "" {
certPool := x509.NewCertPool()
pems, err := ioutil.ReadFile(caFile)
if err != nil {