Using SystemCertPool instead of NewCertPool() for intermediate CA

Signed-off-by: Anisha Hirji <ahirji@pivotal.io>
vmware-archive · Nov 17, 2016 · 5a2cf35 · 5a2cf35
1 parent 6fb036e
commit 5a2cf35
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/rc/target.go b/rc/target.go
@@ -335,7 +335,10 @@ func loadCACertPool(caCert string) (cert *x509.CertPool, err error) {
  return nil, nil
  }
 
- pool := x509.NewCertPool()
+ pool, err := x509.SystemCertPool()
+ if err != nil {
+ return nil, err
+ }
  ok := pool.AppendCertsFromPEM([]byte(caCert))
  if !ok {
  return nil, errors.New("CA Cert not valid")

diff --git a/rc/target_test.go b/rc/target_test.go
@@ -114,7 +114,8 @@ AA9WjQKZ7aKQRUzkuxCkPfAyAw7xzvjoyVGM5mKf5p/AfbdynMk2OmufTqj/ZA1k
  base, ok := (*transport).Base.(*http.Transport)
  Expect(ok).To(BeTrue())
 
- expectedCaCertPool := x509.NewCertPool()
+ expectedCaCertPool, err := x509.SystemCertPool()
+ Expect(err).NotTo(HaveOccurred())
  ok = expectedCaCertPool.AppendCertsFromPEM([]byte(rootCA))
  Expect(ok).To(BeTrue())