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

Fix DisableAiaOptionWorks and remove ActiveIssue. #47766

Merged
merged 2 commits into from
Feb 2, 2021
Merged

Fix DisableAiaOptionWorks and remove ActiveIssue. #47766

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
11a966e
Fix DisableAiaOptionWorks and remove ActiveIssue.
vcsjones Feb 2, 2021
38e43e1
Code review feedback
vcsjones Feb 2, 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
15 changes: 8 additions & 7 deletions ...libraries/System.Security.Cryptography.X509Certificates/tests/RevocationTests/AiaTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ public static void EmptyAiaResponseIsIgnored()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/47492", TestPlatforms.OSX)]
public static void DisableAiaOptionWorks()
{
CertificateAuthority.BuildPrivatePki(
Expand All @@ -65,6 +64,14 @@ public static void DisableAiaOptionWorks()
cuCaStore.Open(OpenFlags.ReadWrite);

X509Chain chain = holder.Chain;

// macOS combines revocation and AIA fetching in to a single flag. Both need to be disabled
// to prevent AIA fetches.
if (PlatformDetection.IsOSX)
{
chain.ChainPolicy.RevocationMode = X509RevocationMode.NoCheck;
}

chain.ChainPolicy.DisableCertificateDownloads = true;
chain.ChainPolicy.CustomTrustStore.Add(rootCert);
chain.ChainPolicy.TrustMode = X509ChainTrustMode.CustomRootTrust;
Expand Down Expand Up @@ -102,12 +109,6 @@ public static void DisableAiaOptionWorks()
Assert.Contains(X509ChainStatusFlags.PartialChain, chain.ChainStatus.Select(s => s.Status));
holder.DisposeChainElements();

// macOS doesn't like our revocation responder, so disable revocation checks there.
if (PlatformDetection.IsOSX)
{
chain.ChainPolicy.RevocationMode = X509RevocationMode.NoCheck;
}

chain.ChainPolicy.ExtraStore.Add(intermediateCert);
Assert.True(chain.Build(endEntity), "Chain build with intermediate, AIA disabled");
Assert.Equal(3, chain.ChainElements.Count);
Expand Down