crypto/tls: simplify intermediate certificate handling

The certificates argument to verifyServerCertificate must contain
at least one certificate. Simplify the intermediate certificate
handling code accordingly.

Change-Id: I8292cdfb51f418e011d6d97f47d10b4e631aa932
Reviewed-on: https://go-review.googlesource.com/c/go/+/169657
Reviewed-by: Filippo Valsorda <filippo@golang.org>
This commit is contained in:
Joel Sing 2019-03-20 03:58:42 +11:00 committed by Filippo Valsorda
parent 2d68380713
commit 20389553c7

View file

@ -826,11 +826,7 @@ func (c *Conn) verifyServerCertificate(certificates [][]byte) error {
DNSName: c.config.ServerName, DNSName: c.config.ServerName,
Intermediates: x509.NewCertPool(), Intermediates: x509.NewCertPool(),
} }
for _, cert := range certs[1:] {
for i, cert := range certs {
if i == 0 {
continue
}
opts.Intermediates.AddCert(cert) opts.Intermediates.AddCert(cert)
} }
var err error var err error