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

Use newer microsoft.com certificate chain in X.509 tests #48460

Merged
merged 2 commits into from
Feb 19, 2021
Merged

Use newer microsoft.com certificate chain in X.509 tests #48460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5eee03d
Use newer microsoft.com certificate chain.
vcsjones Feb 18, 2021
b80e67a
Fix typo in method name.
vcsjones Feb 18, 2021
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
8 changes: 4 additions & 4 deletions src/libraries/System.Security.Cryptography.X509Certificates/tests/CertTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,15 +104,15 @@ public void TestVerify()
{
bool success;

using (var microsoftDotCom = new X509Certificate2(TestData.MicrosoftDotComSslCertBytes))
using (var microsoftDotCom = new X509Certificate2(TestData.MicrosoftDotComLegacySslCertBytes))
{
// Fails because expired (NotAfter = 10/16/2016)
Assert.False(microsoftDotCom.Verify(), "MicrosoftDotComSslCertBytes");
Assert.False(microsoftDotCom.Verify(), "MicrosoftDotComLegacySslCertBytes");
}

using (var microsoftDotComIssuer = new X509Certificate2(TestData.MicrosoftDotComIssuerBytes))
{
// NotAfter=10/31/2023
// NotAfter=10/8/2024, 7:00:00 AM UTC
success = microsoftDotComIssuer.Verify();
if (!success)
{
Expand All @@ -128,7 +128,7 @@ public void TestVerify()
{
using (var microsoftDotComRoot = new X509Certificate2(TestData.MicrosoftDotComRootBytes))
{
// NotAfter=7/17/2036
// NotAfter=7/17/2025
success = microsoftDotComRoot.Verify();
if (!success)
{
Expand Down
28 changes: 14 additions & 14 deletions src/libraries/System.Security.Cryptography.X509Certificates/tests/ChainTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ private static bool TrustsMicrosoftDotComRoot
using (var chainHolder = new ChainHolder())
{
X509Chain chain = chainHolder.Chain;
chain.ChainPolicy.VerificationTime = new DateTime(2015, 10, 15, 12, 01, 01, DateTimeKind.Local);
chain.ChainPolicy.VerificationTime = new DateTime(2021, 02, 26, 12, 01, 01, DateTimeKind.Local);
chain.ChainPolicy.RevocationMode = X509RevocationMode.NoCheck;

return chain.Build(microsoftDotCom);
Expand All @@ -49,7 +49,7 @@ public static void BuildChain()

// Halfway between microsoftDotCom's NotBefore and NotAfter
// This isn't a boundary condition test.
chain.ChainPolicy.VerificationTime = new DateTime(2015, 10, 15, 12, 01, 01, DateTimeKind.Local);
chain.ChainPolicy.VerificationTime = new DateTime(2021, 02, 26, 12, 01, 01, DateTimeKind.Local);
chain.ChainPolicy.RevocationMode = X509RevocationMode.NoCheck;

bool valid = chain.Build(microsoftDotCom);
Expand Down Expand Up @@ -81,7 +81,7 @@ public static void VerifyChainFromHandle()
chain.ChainPolicy.ExtraStore.Add(microsoftDotComRoot);
chain.ChainPolicy.ExtraStore.Add(microsoftDotComIssuer);
chain.ChainPolicy.VerificationFlags = X509VerificationFlags.AllowUnknownCertificateAuthority;
chain.ChainPolicy.VerificationTime = new DateTime(2015, 10, 15, 12, 01, 01, DateTimeKind.Local);
chain.ChainPolicy.VerificationTime = new DateTime(2021, 02, 26, 12, 01, 01, DateTimeKind.Local);
chain.ChainPolicy.RevocationMode = X509RevocationMode.NoCheck;

bool valid = chain.Build(microsoftDotCom);
Expand Down Expand Up @@ -112,7 +112,7 @@ public static void VerifyChainFromHandle()

// Re-set the ChainPolicy properties
chain2.ChainPolicy.VerificationFlags = X509VerificationFlags.AllowUnknownCertificateAuthority;
chain2.ChainPolicy.VerificationTime = new DateTime(2015, 10, 15, 12, 01, 01, DateTimeKind.Local);
chain2.ChainPolicy.VerificationTime = new DateTime(2021, 02, 26, 12, 01, 01, DateTimeKind.Local);
chain2.ChainPolicy.RevocationMode = X509RevocationMode.NoCheck;

valid = chain2.Build(microsoftDotCom);
Expand All @@ -130,7 +130,7 @@ public static void VerifyChainFromHandle_Unix()
{
X509Chain chain = chainHolder.Chain;
chain.ChainPolicy.VerificationFlags = X509VerificationFlags.AllowUnknownCertificateAuthority;
chain.ChainPolicy.VerificationTime = new DateTime(2015, 10, 15, 12, 01, 01, DateTimeKind.Local);
chain.ChainPolicy.VerificationTime = new DateTime(2021, 02, 26, 12, 01, 01, DateTimeKind.Local);
chain.ChainPolicy.RevocationMode = X509RevocationMode.NoCheck;

bool valid = chain.Build(microsoftDotCom);
Expand All @@ -152,7 +152,7 @@ public static void TestDispose()
{
chain = chainHolder.Chain;
chain.ChainPolicy.VerificationFlags = X509VerificationFlags.AllowUnknownCertificateAuthority;
chain.ChainPolicy.VerificationTime = new DateTime(2015, 10, 15, 12, 01, 01, DateTimeKind.Local);
chain.ChainPolicy.VerificationTime = new DateTime(2021, 02, 26, 12, 01, 01, DateTimeKind.Local);
chain.ChainPolicy.RevocationMode = X509RevocationMode.NoCheck;
chain.Build(microsoftDotCom);

Expand Down Expand Up @@ -368,17 +368,17 @@ public static void Invalidx509ChainTrustMode(int trustMode)
}
}

public static IEnumerable<object[]> VerifyExpressionData()
public static IEnumerable<object[]> VerifyExpirationData()
{
// The test will be using the chain for TestData.MicrosoftDotComSslCertBytes
// The leaf cert (microsoft.com) is valid from 2014-10-15 00:00:00Z to 2016-10-15 23:59:59Z
// The leaf cert (microsoft.com) is valid from 2020-08-28 22:17:02Z to 2021-08-28 22:17:02Z
DateTime[] validTimes =
{
// The NotBefore value
new DateTime(2014, 10, 15, 0, 0, 0, DateTimeKind.Utc),
new DateTime(2020, 08, 28, 22, 17, 02, DateTimeKind.Utc),

// One second before the NotAfter value
new DateTime(2016, 10, 15, 23, 59, 58, DateTimeKind.Utc),
new DateTime(2021, 08, 28, 22, 17, 01, DateTimeKind.Utc),
};

// The NotAfter value as a boundary condition differs on Windows and OpenSSL.
Expand All @@ -390,10 +390,10 @@ public static IEnumerable<object[]> VerifyExpressionData()
DateTime[] invalidTimes =
{
// One second before the NotBefore time
new DateTime(2014, 10, 14, 23, 59, 59, DateTimeKind.Utc),
new DateTime(2020, 08, 28, 22, 17, 01, DateTimeKind.Utc),

// One second after the NotAfter time
new DateTime(2016, 10, 16, 0, 0, 0, DateTimeKind.Utc),
new DateTime(2021, 08, 28, 22, 17, 03, DateTimeKind.Utc),
};

List<object[]> testCases = new List<object[]>((validTimes.Length + invalidTimes.Length) * 3);
Expand Down Expand Up @@ -426,7 +426,7 @@ public static IEnumerable<object[]> VerifyExpressionData()
}

[Theory]
[MemberData(nameof(VerifyExpressionData))]
[MemberData(nameof(VerifyExpirationData))]
public static void VerifyExpiration_LocalTime(DateTime verificationTime, bool shouldBeValid)
{
using (var microsoftDotCom = new X509Certificate2(TestData.MicrosoftDotComSslCertBytes))
Expand Down Expand Up @@ -684,7 +684,7 @@ public static void BuildChain_MicrosoftDotCom_WithRootCertInUserAndSystemRootCer
}

X509Chain chainValidator = chainHolder.Chain;
chainValidator.ChainPolicy.VerificationTime = new DateTime(2015, 10, 15, 12, 01, 01, DateTimeKind.Local);
chainValidator.ChainPolicy.VerificationTime = new DateTime(2021, 02, 26, 12, 01, 01, DateTimeKind.Local);
chainValidator.ChainPolicy.RevocationMode = X509RevocationMode.NoCheck;

bool chainBuildResult = chainValidator.Build(microsoftDotCom);
Expand Down
6 changes: 3 additions & 3 deletions src/libraries/System.Security.Cryptography.X509Certificates/tests/CollectionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -809,7 +809,7 @@ public static void ExportMultiplePrivateKeys()
Assert.Equal(2, originalPrivateKeyCount);

byte[] exported = collection.Export(X509ContentType.Pkcs12);

using (ImportedCollection ic = Cert.Import(exported))
{
X509Certificate2Collection importedCollection = ic.Collection;
Expand Down Expand Up @@ -1305,7 +1305,7 @@ public static void X509ChainElementCollection_IndexerVsEnumerator()

// Halfway between microsoftDotCom's NotBefore and NotAfter
// This isn't a boundary condition test.
chain.ChainPolicy.VerificationTime = new DateTime(2015, 10, 15, 12, 01, 01, DateTimeKind.Local);
chain.ChainPolicy.VerificationTime = new DateTime(2021, 02, 26, 12, 01, 01, DateTimeKind.Local);
chain.ChainPolicy.RevocationMode = X509RevocationMode.NoCheck;

bool valid = chain.Build(microsoftDotCom);
Expand Down Expand Up @@ -1465,7 +1465,7 @@ public static void ImportFromPem_MultiplePems_Success()
public static void ImportFromPemFile_MultiplePems_Success()
{
string pemAggregate = TestData.RsaCertificate + TestData.ECDsaCertificate;

using (TempFileHolder aggregatePemFile = new TempFileHolder(pemAggregate))
using(ImportedCollection ic = Cert.ImportFromPemFile(aggregatePemFile.FilePath))
{
Expand Down
Loading