Unverified Commit 35afcf65 authored by Alessio Caiazza's avatar Alessio Caiazza

Merge branch '10-3-stable-patch-1' into 10-3-stable

parents 5cf5e19a 1c7e3124
v 10.3.1 (2018-01-22)
- Always load OS certificate pool when evaluating TLS connections !804
v 10.3.0 (2017-12-22)
- Do not use `git config --local` as it's not available in git v1.7.1 !790
- new RC naming schema !780
......
......@@ -107,7 +107,13 @@ func (n *client) addTLSCA(tlsConfig *tls.Config) {
data, err := ioutil.ReadFile(file)
if err == nil {
pool := x509.NewCertPool()
pool, err := x509.SystemCertPool()
if err != nil {
logrus.Warningln("Failed to load system CertPool:", err)
}
if pool == nil {
pool = x509.NewCertPool()
}
if pool.AppendCertsFromPEM(data) {
tlsConfig.RootCAs = pool
n.caData = data
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment