From ae7b41a12c48aa16d1250f8ff260d68cd84710bb Mon Sep 17 00:00:00 2001 From: Mariano Cano Date: Wed, 16 Feb 2022 18:33:33 -0800 Subject: [PATCH] Fix linter errors. --- cas/vaultcas/vaultcas.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cas/vaultcas/vaultcas.go b/cas/vaultcas/vaultcas.go index 1cebcc8c..4d7e220d 100644 --- a/cas/vaultcas/vaultcas.go +++ b/cas/vaultcas/vaultcas.go @@ -114,7 +114,7 @@ func certificateSort(n []*x509.Certificate) bool { return isSorted } -func isSignedBy(i *x509.Certificate, j *x509.Certificate) bool { +func isSignedBy(i, j *x509.Certificate) bool { signer := x509.NewCertPool() signer.AddCert(j) @@ -154,18 +154,18 @@ func getCertificateAndChain(certb certutil.CertBundle) (*Certificate, error) { var leaf *x509.Certificate intermediates := make([]*x509.Certificate, 0) used := make(map[string]bool) // ensure that intermediate are uniq - chains := append(certb.CAChain, []string{certb.Certificate}...) - for _, chain := range chains { + for _, chain := range append(certb.CAChain, certb.Certificate) { for _, cert := range parseCertificates(chain) { if used[cert.SerialNumber.String()] { continue } used[cert.SerialNumber.String()] = true - if isRoot(cert) { + switch { + case isRoot(cert): root = cert - } else if cert.BasicConstraintsValid && cert.IsCA { + case cert.BasicConstraintsValid && cert.IsCA: intermediates = append(intermediates, cert) - } else { + default: leaf = cert } }