Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #554 from mfischer-zd/tls_fixes

Browse Source 
fix(server/tls_info): use all certificates in CA file
This commit is contained in:
Brandon Philips 2014-02-11 10:17:33 -08:00
commit 7015214fbb
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
server/tls_info.go
View File

@ -84,19 +84,23 @@ func (info TLSInfo) ClientConfig() (*tls.Config, error) {
// newCertPool creates x509 certPool with provided CA file
func newCertPool(CAFile string) (*x509.CertPool, error) {
certPool := x509.NewCertPool()
pemByte, err := ioutil.ReadFile(CAFile)
if err != nil {
return nil, err
}
block, pemByte := pem.Decode(pemByte)
cert, err := x509.ParseCertificate(block.Bytes)
if err != nil {
return nil, err
for {
var block *pem.Block
block, pemByte = pem.Decode(pemByte)
if block == nil {
return certPool, nil
}
cert, err := x509.ParseCertificate(block.Bytes)
if err != nil {
return nil, err
}
certPool.AddCert(cert)
}
certPool := x509.NewCertPool()
certPool.AddCert(cert)
return certPool, nil
}