From bc2c6a56ed5132e7e19c66c37408dc95360dcb5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=A5=A5=E8=B6=85?= <iwind.liu@gmail.com>
Date: Thu, 24 Mar 2022 09:25:48 +0800
Subject: [PATCH] =?UTF-8?q?CA=E8=AF=81=E4=B9=A6=E6=94=AF=E6=8C=81=E5=8F=AA?=
 =?UTF-8?q?=E6=9C=89=E4=B8=80=E7=BA=A7=E8=AF=81=E4=B9=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg/serverconfigs/sslconfigs/ssl_cert_config.go | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkg/serverconfigs/sslconfigs/ssl_cert_config.go b/pkg/serverconfigs/sslconfigs/ssl_cert_config.go
index d63ed91..fdbaa10 100644
--- a/pkg/serverconfigs/sslconfigs/ssl_cert_config.go
+++ b/pkg/serverconfigs/sslconfigs/ssl_cert_config.go
@@ -46,9 +46,9 @@ func (this *SSLCertConfig) Init() error {
 
 	// 分析证书
 	if this.IsCA { // CA证书
-		data := this.CertData
+		var data = this.CertData
 
-		index := -1
+		var index = -1
 		this.cert = &tls.Certificate{
 			Certificate: [][]byte{},
 		}
@@ -59,9 +59,6 @@ func (this *SSLCertConfig) Init() error {
 			if block == nil {
 				break
 			}
-			if len(rest) == 0 {
-				break
-			}
 			this.cert.Certificate = append(this.cert.Certificate, block.Bytes)
 			data = rest
 			c, err := x509.ParseCertificate(block.Bytes)
@@ -84,6 +81,10 @@ func (this *SSLCertConfig) Init() error {
 				this.timeBegin = c.NotBefore
 				this.timeEnd = c.NotAfter
 			}
+
+			if len(rest) == 0 {
+				break
+			}
 		}
 	} else { // 证书+私钥
 		cert, err := tls.X509KeyPair(this.CertData, this.KeyData)