forked from TrueCloudLab/certificates
Remove superfluous call to StoreCertificate
This commit is contained in:
parent
97b88c4d58
commit
4cd45f6374
3 changed files with 0 additions and 41 deletions
|
@ -34,7 +34,6 @@ type Interface interface {
|
|||
|
||||
// Authority is the layer that handles all SCEP interactions.
|
||||
type Authority struct {
|
||||
db DB
|
||||
prefix string
|
||||
dns string
|
||||
intermediateCertificate *x509.Certificate
|
||||
|
@ -46,8 +45,6 @@ type Authority struct {
|
|||
type AuthorityOptions struct {
|
||||
// Service provides the certificate chain, the signer and the decrypter to the Authority
|
||||
Service *Service
|
||||
// DB is the database used by SCEP
|
||||
DB DB
|
||||
// DNS is the host used to generate accurate SCEP links. By default the authority
|
||||
// will use the Host from the request, so this value will only be used if
|
||||
// request.Host is empty.
|
||||
|
@ -67,7 +64,6 @@ type SignAuthority interface {
|
|||
func New(signAuth SignAuthority, ops AuthorityOptions) (*Authority, error) {
|
||||
|
||||
authority := &Authority{
|
||||
db: ops.DB,
|
||||
prefix: ops.Prefix,
|
||||
dns: ops.DNS,
|
||||
signAuth: signAuth,
|
||||
|
@ -341,15 +337,6 @@ func (a *Authority) SignCSR(ctx context.Context, csr *x509.CertificateRequest, m
|
|||
CertRepMessage: cr,
|
||||
}
|
||||
|
||||
// store the newly created certificate
|
||||
err = newCert(a.db, CertOptions{
|
||||
Leaf: certChain[0],
|
||||
Intermediates: certChain[1:],
|
||||
})
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return crepMsg, nil
|
||||
}
|
||||
|
||||
|
|
|
@ -1,21 +0,0 @@
|
|||
package scep
|
||||
|
||||
import (
|
||||
"crypto/x509"
|
||||
|
||||
"github.com/pkg/errors"
|
||||
)
|
||||
|
||||
// CertOptions options with which to create and store a cert object.
|
||||
type CertOptions struct {
|
||||
Leaf *x509.Certificate
|
||||
Intermediates []*x509.Certificate
|
||||
}
|
||||
|
||||
func newCert(db DB, ops CertOptions) error {
|
||||
err := db.StoreCertificate(ops.Leaf)
|
||||
if err != nil {
|
||||
errors.Wrap(err, "error while storing certificate")
|
||||
}
|
||||
return nil
|
||||
}
|
|
@ -2,18 +2,11 @@ package scep
|
|||
|
||||
// Error is an SCEP error type
|
||||
type Error struct {
|
||||
// Type ProbType
|
||||
// Detail string
|
||||
Message string `json:"message"`
|
||||
Status int `json:"-"`
|
||||
// Sub []*Error
|
||||
// Identifier *Identifier
|
||||
}
|
||||
|
||||
// Error implements the error interface.
|
||||
func (e *Error) Error() string {
|
||||
// if e.Err == nil {
|
||||
// return e.Detail
|
||||
// }
|
||||
return e.Message
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue