Add minimal NewCertificateFromX509 implementation
#248
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
hslatman
force-pushed
the
herman/minimal-certificate-without-csr
branch
from
e844e81
to
f5e8c24
Compare
This was referenced May 26, 2023
hslatman
added a commit
to smallstep/cli
that referenced
this pull request
May 26, 2023
Instead of relying on a new implementation based on generics, smallstep/crypto#248 was created to have a minimal implementation for supporting signing public keys.
maraino
previously approved these changes
May 26, 2023
x509util/certificate.go
Outdated
Comment on lines
107
to
135
| // If no template use only the certificate request with the | ||
| // default leaf key usages. | ||
| if o.CertBuffer == nil { | ||
| return nil, errors.New("not implemented yet; use FromX509WithTemplate option") | ||
| } | ||
|
|
||
| // With templates | ||
| var cert Certificate | ||
| if err := json.NewDecoder(o.CertBuffer).Decode(&cert); err != nil { | ||
| return nil, errors.Wrap(err, "error unmarshaling certificate") | ||
| } | ||
|
|
||
| // Enforce the public key from the template | ||
| cert.PublicKey = template.PublicKey | ||
| cert.PublicKeyAlgorithm = template.PublicKeyAlgorithm | ||
|
|
||
| // Generate the subjectAltName extension if the certificate contains SANs | ||
| // that are not supported in the Go standard library. | ||
| if cert.hasExtendedSANs() && !cert.hasExtension(oidExtensionSubjectAltName) { | ||
| ext, err := createCertificateSubjectAltNameExtension(cert, cert.Subject.IsEmpty()) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| // Prepend extension to achieve a certificate as similar as possible to | ||
| // the one generated by the Go standard library. | ||
| cert.Extensions = append([]Extension{ext}, cert.Extensions...) | ||
| } | ||
|
|
||
| return &cert, nil |
There was a problem hiding this comment.
This is duplicated logic that can be combined into one internal function.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Minimal implementation of
NewCertificateFromX509to create anx509.Certificatewithout signing a CSR.This PR replaces #239 and #247. We decided on keeping the logic simple, and to not add generic processing of
x509.Certificateandx509.CertificateRequestfor now.The changes from the other PRs might still be of interest in the (near) future when more options are added for manipulating a
x509.Certificateorx509.CertificateRequest, so we may reconsider the decision by then.