Skip to content

Commit 11648f8

Browse files
small tweak for readability
1 parent 13f2971 commit 11648f8

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

cert/ca.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,25 +30,24 @@ func NewCAPool() *NebulaCAPool {
3030
// returned along with the pool. The caller must handle any such errors.
3131
func NewCAPoolFromBytes(caPEMs []byte) (*NebulaCAPool, []error, error) {
3232
pool := NewCAPool()
33-
var err error
3433
var warnings []error
3534
var expired bool
3635
for {
36+
var err error
3737
caPEMs, err = pool.AddCACertificate(caPEMs)
3838
if errors.Is(err, ErrExpired) {
3939
expired = true
40-
err = nil
4140
} else if errors.Is(err, ErrInvalidPEMCertificateUnsupported) {
4241
warnings = append(warnings, err)
43-
err = nil
44-
}
45-
if err != nil {
42+
} else if err != nil {
4643
return nil, warnings, err
4744
}
45+
4846
if len(caPEMs) == 0 || strings.TrimSpace(string(caPEMs)) == "" {
4947
break
5048
}
5149
}
50+
5251
if len(pool.CAs) == 0 {
5352
return nil, warnings, errors.New("no valid CA certificates present")
5453
}

0 commit comments

Comments
 (0)