Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Simplify KU, EKU, and SKID fields of issued certs #472

Merged
merged 2 commits into from
Aug 21, 2024
Merged

Simplify KU, EKU, and SKID fields of issued certs #472

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4406bef
Simplify KU, EKU, and SKID fields of issued certs
aarongable Aug 20, 2024
27ca110
Review comment
aarongable Aug 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 7 additions & 12 deletions ca/ca.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ func makeKey() (*rsa.PrivateKey, []byte, error) {
return key, ski, nil
}

func (ca *CAImpl) makeRootCert(
func (ca *CAImpl) makeCACert(
subjectKey crypto.Signer,
subject pkix.Name,
subjectKeyID []byte,
Expand All @@ -122,7 +122,7 @@ func (ca *CAImpl) makeRootCert(
NotAfter: time.Now().AddDate(30, 0, 0),

KeyUsage: x509.KeyUsageDigitalSignature | x509.KeyUsageCertSign,
ExtKeyUsage: []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth, x509.ExtKeyUsageClientAuth},
ExtKeyUsage: []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth},
SubjectKeyId: subjectKeyID,
BasicConstraintsValid: true,
IsCA: true,
Expand Down Expand Up @@ -175,7 +175,7 @@ func (ca *CAImpl) newRootIssuer(name string) (*issuer, error) {
subject := pkix.Name{
CommonName: rootCAPrefix + name,
}
rc, err := ca.makeRootCert(rk, subject, subjectKeyID, nil)
rc, err := ca.makeCACert(rk, subject, subjectKeyID, nil)
if err != nil {
return nil, err
}
Expand All @@ -192,7 +192,7 @@ func (ca *CAImpl) newIntermediateIssuer(root *issuer, intermediateKey crypto.Sig
return nil, errors.New("internal error: root must not be nil")
}
// Make an intermediate certificate with the root issuer
ic, err := ca.makeRootCert(intermediateKey, subject, subjectKeyID, root)
ic, err := ca.makeCACert(intermediateKey, subject, subjectKeyID, root)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -257,18 +257,14 @@ func (ca *CAImpl) newCertificate(domains []string, ips []net.IP, key crypto.Publ
if len(domains) == 0 && len(ips) == 0 {
return nil, errors.New("must specify at least one domain name or IP address")
}
var err error
aarongable marked this conversation as resolved.
Show resolved Hide resolved

defaultChain := ca.chains[0].intermediates
if len(defaultChain) == 0 || defaultChain[0].cert == nil {
return nil, errors.New("cannot sign certificate - nil issuer")
}
issuer := defaultChain[0]

subjectKeyID, err := makeSubjectKeyID(key)
if err != nil {
return nil, fmt.Errorf("cannot create subject key ID: %s", err.Error())
}

certNotBefore := time.Now()
if notBefore != "" {
certNotBefore, err = time.Parse(time.RFC3339, notBefore)
Expand Down Expand Up @@ -297,9 +293,8 @@ func (ca *CAImpl) newCertificate(domains []string, ips []net.IP, key crypto.Publ
NotBefore: certNotBefore,
NotAfter: certNotAfter,

KeyUsage: x509.KeyUsageDigitalSignature | x509.KeyUsageKeyEncipherment,
ExtKeyUsage: []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth, x509.ExtKeyUsageClientAuth},
SubjectKeyId: subjectKeyID,
KeyUsage: x509.KeyUsageDigitalSignature,
ExtKeyUsage: []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth},
ExtraExtensions: extensions,
BasicConstraintsValid: true,
IsCA: false,
Expand Down
Loading