TrueCloudLab/certificates
17
0
Fork 2
Code Issues 1 Pull requests 1 Releases Activity Actions

Fix linter issues

Browse source
This commit is contained in:
Herman Slatman 2021-03-10 22:39:20 +01:00
parent cc1ecb9438
commit 538fe8114d
No known key found for this signature in database
GPG key ID: F4D8A44EA0A75A4F
5 changed files with 18 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
authority/authority.go
View file

@ -224,6 +224,9 @@ func (a *Authority) init() error {
DecryptionKey: a.config.IntermediateKey, DecryptionKey: a.config.IntermediateKey,
Password: []byte(a.config.Password), Password: []byte(a.config.Password),
}) })
if err != nil {
return err
}
} }
a.scepService = &scep.Service{ a.scepService = &scep.Service{

7
scep/api/api.go
View file

@ -315,13 +315,6 @@ func (h *Handler) PKIOperation(ctx context.Context, request SCEPRequest) (SCEPRe
return response, nil return response, nil
} }
func certName(cert *x509.Certificate) string {
if cert.Subject.CommonName != "" {
return cert.Subject.CommonName
}
return string(cert.Signature)
}
func formatCapabilities(caps []string) []byte { func formatCapabilities(caps []string) []byte {
return []byte(strings.Join(caps, "\r\n")) return []byte(strings.Join(caps, "\r\n"))
} }

16
scep/authority.go
View file

@ -3,8 +3,6 @@ package scep
import ( import (
"bytes" "bytes"
"context" "context"
"crypto"
"crypto/sha1"
"crypto/x509" "crypto/x509"
"errors" "errors"
"fmt" "fmt"
@ -512,20 +510,6 @@ func degenerateCertificates(certs []*x509.Certificate) ([]byte, error) {
return degenerate, nil return degenerate, nil
} }
// createKeyIdentifier creates an identifier for public keys
// according to the first method in RFC5280 section 4.2.1.2.
func createKeyIdentifier(pub crypto.PublicKey) ([]byte, error) {
keyBytes, err := x509.MarshalPKIXPublicKey(pub)
if err != nil {
return nil, err
}
id := sha1.Sum(keyBytes)
return id[:], nil
}
// Interface guards // Interface guards
var ( var (
_ Interface = (*Authority)(nil) _ Interface = (*Authority)(nil)

26
scep/certificate.go
View file

@ -65,16 +65,16 @@ func newCert(db nosql.DB, ops CertOptions) (*certificate, error) {
} }
} }
func getCert(db nosql.DB, id string) (*certificate, error) { // func getCert(db nosql.DB, id string) (*certificate, error) {
b, err := db.Get(certTable, []byte(id)) // b, err := db.Get(certTable, []byte(id))
if nosql.IsErrNotFound(err) { // if nosql.IsErrNotFound(err) {
return nil, fmt.Errorf("certificate %s not found", id) // return nil, fmt.Errorf("certificate %s not found", id)
} else if err != nil { // } else if err != nil {
return nil, fmt.Errorf("error loading certificate") // return nil, fmt.Errorf("error loading certificate")
} // }
var cert certificate // var cert certificate
if err := json.Unmarshal(b, &cert); err != nil { // if err := json.Unmarshal(b, &cert); err != nil {
return nil, fmt.Errorf("%w: error unmarshaling certificate", err) // return nil, fmt.Errorf("%w: error unmarshaling certificate", err)
} // }
return &cert, nil // return &cert, nil
} // }

3
scep/scep.go
View file

@ -31,8 +31,9 @@ var (
oidSCEPsenderNonce = asn1.ObjectIdentifier{2, 16, 840, 1, 113733, 1, 9, 5} oidSCEPsenderNonce = asn1.ObjectIdentifier{2, 16, 840, 1, 113733, 1, 9, 5}
oidSCEPrecipientNonce = asn1.ObjectIdentifier{2, 16, 840, 1, 113733, 1, 9, 6} oidSCEPrecipientNonce = asn1.ObjectIdentifier{2, 16, 840, 1, 113733, 1, 9, 6}
oidSCEPtransactionID = asn1.ObjectIdentifier{2, 16, 840, 1, 113733, 1, 9, 7} oidSCEPtransactionID = asn1.ObjectIdentifier{2, 16, 840, 1, 113733, 1, 9, 7}
oidChallengePassword = asn1.ObjectIdentifier{1, 2, 840, 113549, 1, 9, 7}
oidSCEPfailInfoText = asn1.ObjectIdentifier{1, 3, 6, 1, 5, 5, 7, 24} oidSCEPfailInfoText = asn1.ObjectIdentifier{1, 3, 6, 1, 5, 5, 7, 24}
//oidChallengePassword = asn1.ObjectIdentifier{1, 2, 840, 113549, 1, 9, 7}
) )
// PKIMessage defines the possible SCEP message types // PKIMessage defines the possible SCEP message types