Skip to content
Merged
Changes from all commits
Commits
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: 16 additions & 3 deletions src/linux-dev-certs/CertificateManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -279,10 +279,23 @@ static internal X509Certificate2 CreateCertificate(
{
// RFC 5280 section 4.2.1.2
var subjectKeyIdentifier = new X509SubjectKeyIdentifierExtension(request.PublicKey, X509SubjectKeyIdentifierHashAlgorithm.Sha256, critical: false);
// RFC 5280 section 4.2.1.1
var authorityKeyIdentifier = X509AuthorityKeyIdentifierExtension.CreateFromSubjectKeyIdentifier(subjectKeyIdentifier);

request.CertificateExtensions.Add(subjectKeyIdentifier);

// RFC 5280 section 4.2.1.1 - AKI must point to issuer's SKI, not self
X509AuthorityKeyIdentifierExtension authorityKeyIdentifier;
if (issuerCert != null)
{
// For CA-signed certs: AKI = issuer's SKI
var issuerSki = issuerCert.Extensions.OfType<X509SubjectKeyIdentifierExtension>().FirstOrDefault();
authorityKeyIdentifier = issuerSki != null
? X509AuthorityKeyIdentifierExtension.CreateFromSubjectKeyIdentifier(issuerSki)
: X509AuthorityKeyIdentifierExtension.CreateFromSubjectKeyIdentifier(subjectKeyIdentifier);
}
else
{
// For self-signed: AKI = own SKI
authorityKeyIdentifier = X509AuthorityKeyIdentifierExtension.CreateFromSubjectKeyIdentifier(subjectKeyIdentifier);
}
request.CertificateExtensions.Add(authorityKeyIdentifier);
}

Expand Down
Loading