Merge branch 'v1.7.2' into master

2018-10-05 12:43:17 +02:00
parent 1431ac5751 a9deeb321b
commit 05f052b092
36 changed files with 696 additions and 176 deletions
--- a/types/types.go
+++ b/types/types.go
@@ -530,7 +530,9 @@ func (clientTLS *ClientTLS) CreateTLSConfig() (*tls.Config, error) {
 		} else {
 			ca = []byte(clientTLS.CA)
 		}
-		caPool.AppendCertsFromPEM(ca)
+		if !caPool.AppendCertsFromPEM(ca) {
+			return nil, fmt.Errorf("failed to parse CA")
+		}
 		if clientTLS.CAOptional {
 			clientAuth = tls.VerifyClientCertIfGiven
 		} else {