alexvanin/certificates
1
0
Fork 0
forked from TrueCloudLab/certificates
Code Pull requests Activity

fix: apply suggestion to use cr only

Browse source
This commit is contained in:
Ahmet DEMIR 2022-01-27 11:19:31 +01:00
parent b49ac2501b
commit 782ff76963
No known key found for this signature in database
GPG key ID: 7F0E92AFAC67CDD5
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
cas/vaultcas/vaultcas.go
View file

@ -10,7 +10,6 @@ import (
"time" "time"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/smallstep/certificates/api"
"github.com/smallstep/certificates/cas/apiv1" "github.com/smallstep/certificates/cas/apiv1"
vault "github.com/hashicorp/vault/api" vault "github.com/hashicorp/vault/api"
@ -129,22 +128,21 @@ func parseCertificateRequest(pemCsr string) (*x509.CertificateRequest, error) {
func (v *VaultCAS) createCertificate(cr *x509.CertificateRequest, lifetime time.Duration) (*x509.Certificate, []*x509.Certificate, error) { func (v *VaultCAS) createCertificate(cr *x509.CertificateRequest, lifetime time.Duration) (*x509.Certificate, []*x509.Certificate, error) {
var vaultPKIRole string var vaultPKIRole string
csr := api.CertificateRequest{CertificateRequest: cr}
switch { switch {
case csr.PublicKeyAlgorithm == x509.RSA: case cr.PublicKeyAlgorithm == x509.RSA:
vaultPKIRole = v.config.PKIRoleRSA vaultPKIRole = v.config.PKIRoleRSA
case csr.PublicKeyAlgorithm == x509.ECDSA: case cr.PublicKeyAlgorithm == x509.ECDSA:
vaultPKIRole = v.config.PKIRoleEC vaultPKIRole = v.config.PKIRoleEC
case csr.PublicKeyAlgorithm == x509.Ed25519: case cr.PublicKeyAlgorithm == x509.Ed25519:
vaultPKIRole = v.config.PKIRoleEd25519 vaultPKIRole = v.config.PKIRoleEd25519
default: default:
return nil, nil, errors.Errorf("createCertificate: Unsupported public key algorithm '%v'", csr.PublicKeyAlgorithm) return nil, nil, errors.Errorf("createCertificate: Unsupported public key algorithm '%v'", cr.PublicKeyAlgorithm)
} }
certPemBytes := pem.EncodeToMemory(&pem.Block{Type: "CERTIFICATE REQUEST", Bytes: csr.Raw}) certPemBytes := pem.EncodeToMemory(&pem.Block{Type: "CERTIFICATE REQUEST", Bytes: cr.Raw})
if certPemBytes == nil { if certPemBytes == nil {
return nil, nil, errors.Errorf("createCertificate: Failed to encode pem '%v'", csr.Raw) return nil, nil, errors.Errorf("createCertificate: Failed to encode pem '%v'", cr.Raw)
} }
y := map[string]interface{}{ y := map[string]interface{}{