diff --git a/pkg/config/config.go b/pkg/config/config.go index 9ed8022..da723ca 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -21,6 +21,7 @@ func ParseFile(file string) (cfg *Config, err error) { if err != nil { return } + defer f.Close() cfg = new(Config) err = yaml.NewDecoder(f).Decode(cfg) if err != nil { diff --git a/pkg/raft/tls/stream.go b/pkg/raft/tls/stream.go index 3227cfc..77c74e6 100644 --- a/pkg/raft/tls/stream.go +++ b/pkg/raft/tls/stream.go @@ -5,7 +5,6 @@ import ( "crypto/x509" "io/ioutil" "net" - "os" "time" "git.giftfish.de/ston1th/vipman/pkg/config" @@ -25,23 +24,12 @@ func loadCertPool(file string) (p *x509.CertPool, err error) { if file == "" { return } - f, err := os.Open(file) - if err != nil { - return - } - defer f.Close() - buf, err := ioutil.ReadAll(f) - if err != nil { - return - } - certs, err := x509.ParseCertificates(buf) + buf, err := ioutil.ReadFile(file) if err != nil { return } p = x509.NewCertPool() - for _, c := range certs { - p.AddCert(c) - } + p.AppendCertsFromPEM(buf) return }