From 5f42ae0bce8c7ba16ca4c83240b7f8f25a07f97b Mon Sep 17 00:00:00 2001 From: Herman Slatman Date: Thu, 27 Jan 2022 21:06:55 +0100 Subject: [PATCH] Remove unused function LoadProvisionerByID from SCEP --- scep/authority.go | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/scep/authority.go b/scep/authority.go index 1bdd1e0a..269e3ae1 100644 --- a/scep/authority.go +++ b/scep/authority.go @@ -21,7 +21,6 @@ import ( // Interface is the SCEP authority interface. type Interface interface { LoadProvisionerByName(string) (provisioner.Interface, error) - LoadProvisionerByID(string) (provisioner.Interface, error) GetLinkExplicit(provName string, absoluteLink bool, baseURL *url.URL, inputs ...string) string GetCACertificates(ctx context.Context) ([]*x509.Certificate, error) @@ -58,7 +57,6 @@ type AuthorityOptions struct { // SignAuthority is the interface for a signing authority type SignAuthority interface { Sign(cr *x509.CertificateRequest, opts provisioner.SignOptions, signOpts ...provisioner.SignOption) ([]*x509.Certificate, error) - LoadProvisionerByID(string) (provisioner.Interface, error) LoadProvisionerByName(string) (provisioner.Interface, error) } @@ -97,12 +95,6 @@ var ( } ) -// LoadProvisionerByID calls out to the SignAuthority interface to load a -// provisioner by ID. -func (a *Authority) LoadProvisionerByID(id string) (provisioner.Interface, error) { - return a.signAuth.LoadProvisionerByID(id) -} - // LoadProvisionerByName calls out to the SignAuthority interface to load a // provisioner by name. func (a *Authority) LoadProvisionerByName(name string) (provisioner.Interface, error) { @@ -285,11 +277,7 @@ func (a *Authority) SignCSR(ctx context.Context, csr *x509.CertificateRequest, m return nil, errors.Wrap(err, "error retrieving authorization options from SCEP provisioner") } - opts := provisioner.SignOptions{ - // NotBefore: provisioner.NewTimeDuration(o.NotBefore), - // NotAfter: provisioner.NewTimeDuration(o.NotAfter), - } - + opts := provisioner.SignOptions{} templateOptions, err := provisioner.TemplateOptions(p.GetOptions(), data) if err != nil { return nil, errors.Wrap(err, "error creating template options from SCEP provisioner")