From 17f6996941234a7a5bcc3fbf45daf7199a5899c0 Mon Sep 17 00:00:00 2001 From: Oilbeater Date: Wed, 11 Apr 2018 20:30:16 +0800 Subject: [PATCH] fix nil pointer when ssl with ca.crt (#2331) --- internal/net/ssl/ssl.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/internal/net/ssl/ssl.go b/internal/net/ssl/ssl.go index e2eb6141b..07ef11003 100644 --- a/internal/net/ssl/ssl.go +++ b/internal/net/ssl/ssl.go @@ -265,7 +265,7 @@ func AddCertAuth(name string, ca []byte, fs file.Filesystem) (*ingress.SSLCert, return nil, fmt.Errorf("CA file %v contains invalid data, and must be created only with PEM formatted certificates", name) } - _, err := x509.ParseCertificate(pemCABlock.Bytes) + pemCert, err := x509.ParseCertificate(pemCABlock.Bytes) if err != nil { return nil, err } @@ -283,6 +283,7 @@ func AddCertAuth(name string, ca []byte, fs file.Filesystem) (*ingress.SSLCert, glog.V(3).Infof("Created CA Certificate for Authentication: %v", caFileName) return &ingress.SSLCert{ + Certificate: pemCert, CAFileName: caFileName, PemFileName: caFileName, PemSHA: file.SHA1(caFileName),