Skip to content

Small refactor to BuildElement to address NRT changes #92742

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

Merged
merged 1 commit into from
Sep 28, 2023
Merged

Small refactor to BuildElement to address NRT changes #92742

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
16 changes: 7 additions & 9 deletions ...Security.Cryptography/src/System/Security/Cryptography/X509Certificates/ChainPal.Apple.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,16 +348,14 @@ private void BuildAndSetProperties((X509Certificate2, int)[] elementTuples)

for (int i = 0; i < elementTuples.Length; i++)
{
(X509Certificate2, int) tuple = elementTuples[i];
(X509Certificate2 cert, int chainStatus) = elementTuples[i];

elements[i] = BuildElement(tuple.Item1, tuple.Item2);
allStatus |= tuple.Item2;
elements[i] = new X509ChainElement(cert, BuildChainElementStatuses(cert, chainStatus), "");
allStatus |= chainStatus;
}

ChainElements = elements;

X509ChainElement rollupElement = BuildElement(null!, allStatus);
ChainStatus = rollupElement.ChainElementStatus;
ChainStatus = BuildChainElementStatuses(null, allStatus);
}

private static void FixupRevocationStatus(
Expand Down Expand Up @@ -457,11 +455,11 @@ private static X509ChainStatusFlags FindUntrustedRootReason(X509Certificate2 cer
return X509ChainStatusFlags.UntrustedRoot;
}

private X509ChainElement BuildElement(X509Certificate2 cert, int dwStatus)
private X509ChainStatus[] BuildChainElementStatuses(X509Certificate2? cert, int dwStatus)
{
if (dwStatus == 0)
{
return new X509ChainElement(cert, Array.Empty<X509ChainStatus>(), "");
return Array.Empty<X509ChainStatus>();
}

List<X509ChainStatus> statuses = new List<X509ChainStatus>();
Expand Down Expand Up @@ -499,7 +497,7 @@ private X509ChainElement BuildElement(X509Certificate2 cert, int dwStatus)
}
}

return new X509ChainElement(cert, statuses.ToArray(), "");
return statuses.ToArray();
}

private readonly struct X509ChainErrorMapping
Expand Down