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

Make revocation tests use CRLBuilder instead of its own copy #72886

Merged
merged 1 commit into from
Jul 27, 2022
Merged

Make revocation tests use CRLBuilder instead of its own copy #72886

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
81 changes: 66 additions & 15 deletions ...raries/Common/tests/System/Security/Cryptography/X509Certificates/CertificateAuthority.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ internal sealed class CertificateAuthority : IDisposable
private byte[] _certData;
private X509Extension _cdpExtension;
private X509Extension _aiaExtension;
private X509Extension _akidExtension;
private X509AuthorityKeyIdentifierExtension _akidExtension;

private List<(byte[], DateTimeOffset)> _revocationList;
private byte[] _crl;
Expand Down Expand Up @@ -305,7 +305,67 @@ internal byte[] GetCrl()
}

DateTimeOffset newExpiry = now.AddSeconds(2);
X509AuthorityKeyIdentifierExtension akid = _akidExtension ??= CreateAkidExtension();

if (OmitNextUpdateInCrl)
{
crl = BuildCrlManually(now, newExpiry, akid);
}
else
{
CertificateRevocationListBuilder builder = new CertificateRevocationListBuilder();

if (_revocationList is not null)
{
foreach ((byte[] serial, DateTimeOffset when) in _revocationList)
{
builder.AddEntry(serial, when);
}
}

DateTimeOffset thisUpdate;
DateTimeOffset nextUpdate;

if (RevocationExpiration.HasValue)
{
nextUpdate = RevocationExpiration.GetValueOrDefault();
thisUpdate = _cert.NotBefore;
}
else
{
thisUpdate = now;
nextUpdate = newExpiry;
}

using (RSA key = _cert.GetRSAPrivateKey())
{
crl = builder.Build(
CorruptRevocationIssuerName ? s_nonParticipatingName : _cert.SubjectName,
X509SignatureGenerator.CreateForRSA(key, RSASignaturePadding.Pkcs1),
_crlNumber,
nextUpdate,
HashAlgorithmName.SHA256,
_akidExtension,
thisUpdate);
}
}

if (CorruptRevocationSignature)
{
crl[^2] ^= 0xFF;
}

_crl = crl;
_crlExpiry = newExpiry;
_crlNumber++;
return crl;
}

private byte[] BuildCrlManually(
DateTimeOffset now,
DateTimeOffset newExpiry,
X509AuthorityKeyIdentifierExtension akidExtension)
{
AsnWriter writer = new AsnWriter(AsnEncodingRules.DER);

using (writer.PushSequence())
Expand Down Expand Up @@ -383,22 +443,17 @@ internal byte[] GetCrl()
// Extensions (SEQUENCE OF)
using (writer.PushSequence())
{
if (_akidExtension == null)
{
_akidExtension = CreateAkidExtension();
}

// Authority Key Identifier Extension
using (writer.PushSequence())
{
writer.WriteObjectIdentifier(_akidExtension.Oid.Value);
writer.WriteObjectIdentifier(akidExtension.Oid.Value);

if (_akidExtension.Critical)
if (akidExtension.Critical)
{
writer.WriteBoolean(true);
}

writer.WriteOctetString(_akidExtension.RawData);
writer.WriteOctetString(akidExtension.RawData);
}

// CRL Number Extension
Expand Down Expand Up @@ -439,11 +494,7 @@ internal byte[] GetCrl()
writer.WriteBitString(signature);
}

_crl = writer.Encode();

_crlExpiry = newExpiry;
_crlNumber++;
return _crl;
return writer.Encode();
}

internal void DesignateOcspResponder(X509Certificate2 responder)
Expand Down Expand Up @@ -732,7 +783,7 @@ private static X509Extension CreateCdpExtension(string cdp)
return new X509Extension("2.5.29.31", writer.Encode(), false);
}

private X509Extension CreateAkidExtension()
private X509AuthorityKeyIdentifierExtension CreateAkidExtension()
{
X509SubjectKeyIdentifierExtension skid =
_cert.Extensions.OfType<X509SubjectKeyIdentifierExtension>().SingleOrDefault();
Expand Down