File tree Expand file tree Collapse file tree 1 file changed +4
-5
lines changed Expand file tree Collapse file tree 1 file changed +4
-5
lines changed Original file line number Diff line number Diff line change @@ -30,25 +30,24 @@ func NewCAPool() *NebulaCAPool {
30
30
// returned along with the pool. The caller must handle any such errors.
31
31
func NewCAPoolFromBytes (caPEMs []byte ) (* NebulaCAPool , []error , error ) {
32
32
pool := NewCAPool ()
33
- var err error
34
33
var warnings []error
35
34
var expired bool
36
35
for {
36
+ var err error
37
37
caPEMs , err = pool .AddCACertificate (caPEMs )
38
38
if errors .Is (err , ErrExpired ) {
39
39
expired = true
40
- err = nil
41
40
} else if errors .Is (err , ErrInvalidPEMCertificateUnsupported ) {
42
41
warnings = append (warnings , err )
43
- err = nil
44
- }
45
- if err != nil {
42
+ } else if err != nil {
46
43
return nil , warnings , err
47
44
}
45
+
48
46
if len (caPEMs ) == 0 || strings .TrimSpace (string (caPEMs )) == "" {
49
47
break
50
48
}
51
49
}
50
+
52
51
if len (pool .CAs ) == 0 {
53
52
return nil , warnings , errors .New ("no valid CA certificates present" )
54
53
}
You can’t perform that action at this time.
0 commit comments