Remove unneeded looping since Go 1.10 cover it already (#4010)
This commit is contained in:
parent
be53e38fe0
commit
bfed4af48f
|
@ -439,28 +439,12 @@ func validateConnState(roots *x509.CertPool, cs *tls.ConnectionState) ([][]*x509
|
|||
}
|
||||
}
|
||||
|
||||
var chains [][]*x509.Certificate
|
||||
var err error
|
||||
switch {
|
||||
case len(certs[0].DNSNames) > 0:
|
||||
for _, dnsName := range certs[0].DNSNames {
|
||||
opts.DNSName = dnsName
|
||||
chains, err = certs[0].Verify(opts)
|
||||
if err != nil {
|
||||
if _, ok := err.(x509.UnknownAuthorityError); ok {
|
||||
return nil, nil
|
||||
}
|
||||
return nil, errors.New("failed to verify client's certificate: " + err.Error())
|
||||
}
|
||||
}
|
||||
default:
|
||||
chains, err = certs[0].Verify(opts)
|
||||
if err != nil {
|
||||
if _, ok := err.(x509.UnknownAuthorityError); ok {
|
||||
return nil, nil
|
||||
}
|
||||
return nil, errors.New("failed to verify client's certificate: " + err.Error())
|
||||
chains, err := certs[0].Verify(opts)
|
||||
if err != nil {
|
||||
if _, ok := err.(x509.UnknownAuthorityError); ok {
|
||||
return nil, nil
|
||||
}
|
||||
return nil, errors.New("failed to verify client's certificate: " + err.Error())
|
||||
}
|
||||
|
||||
return chains, nil
|
||||
|
|
Loading…
Reference in New Issue