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)