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

trust: do not call x509.SystemCertPool as nil will use this as default

Browse Source 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
This commit is contained in:
Riyaz Faizullabhoy 2017-07-14 14:39:39 -07:00
parent f255d671c6
commit c3b2c7d575
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, TLSClientConfig: tlsConfig,
} }
// Override with the system cert pool if the caFile was empty // Override with the system cert pool if the caFile was empty
if caFile == "" { if caFile != "" {
systemCertPool, err := x509.SystemCertPool()
if err != nil {
return nil, err
}
transport.TLSClientConfig.RootCAs = systemCertPool
} else {
certPool := x509.NewCertPool() certPool := x509.NewCertPool()
pems, err := ioutil.ReadFile(caFile) pems, err := ioutil.ReadFile(caFile)
if err != nil { if err != nil {