status-im/consul
2
0
Fork 0
mirror of https://github.com/status-im/consul.git synced 2025-02-23 10:58:25 +00:00
Code Issues Projects Releases Wiki Activity

consul: Fix decoding of certificate

Browse Source
This commit is contained in:
Armon Dadgar 2014-04-07 12:45:48 -07:00
parent 39a55953af
commit 165103d55e
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
consul/config.go
View File

@ -3,6 +3,7 @@ package consul
import ( import (
"crypto/tls" "crypto/tls"
"crypto/x509" "crypto/x509"
"encoding/pem"
"fmt" "fmt"
"github.com/hashicorp/memberlist" "github.com/hashicorp/memberlist"
"github.com/hashicorp/raft" "github.com/hashicorp/raft"
@ -136,8 +137,14 @@ func (c *Config) CACertificate() (*x509.Certificate, error) {
return nil, fmt.Errorf("Failed to read CA file: %v", err) return nil, fmt.Errorf("Failed to read CA file: %v", err)
} }
// Decode from the PEM format
block, _ := pem.Decode(data)
if block == nil {
return nil, fmt.Errorf("Failed to decode CA PEM!")
}
// Parse the certificate // Parse the certificate
cert, err := x509.ParseCertificate(data) cert, err := x509.ParseCertificate(block.Bytes)
if err != nil { if err != nil {
return nil, fmt.Errorf("Failed to parse CA file: %v", err) return nil, fmt.Errorf("Failed to parse CA file: %v", err)
} }
@ -222,7 +229,7 @@ func (c *Config) IncomingTLSConfig() (*tls.Config, error) {
return nil, fmt.Errorf("VerifyIncoming set, and no Cert/Key pair provided!") return nil, fmt.Errorf("VerifyIncoming set, and no Cert/Key pair provided!")
} }
} }
return nil, nil return tlsConfig, nil
} }
// DefaultConfig is used to return a sane default configuration // DefaultConfig is used to return a sane default configuration