Skip to content

CmsSigner: dispose X509Chain #120142

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 2 commits into from
Sep 30, 2025
Merged

CmsSigner: dispose X509Chain #120142

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d541e54
CmsSigner: dispose X509Chain
MaxPatri Sep 26, 2025
7367d68
Dispose only chain
MaxPatri Sep 30, 2025
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
79 changes: 43 additions & 36 deletions ...ries/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/CmsSigner.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,54 +449,61 @@ internal SignerInfoAsn Sign(
else if (IncludeOption != X509IncludeOption.None)
{
X509Chain chain = new X509Chain();
chain.ChainPolicy.RevocationMode = X509RevocationMode.NoCheck;
chain.ChainPolicy.VerificationFlags = X509VerificationFlags.AllFlags;
chain.ChainPolicy.VerificationTime = Certificate!.NotBefore;

if (!chain.Build(Certificate!))
try
{
foreach (X509ChainStatus status in chain.ChainStatus)
chain.ChainPolicy.RevocationMode = X509RevocationMode.NoCheck;
chain.ChainPolicy.VerificationFlags = X509VerificationFlags.AllFlags;
chain.ChainPolicy.VerificationTime = Certificate!.NotBefore;

if (!chain.Build(Certificate!))
{
if (status.Status == X509ChainStatusFlags.PartialChain)
foreach (X509ChainStatus status in chain.ChainStatus)
{
if (chain.ChainElements.Count == 0)
if (status.Status == X509ChainStatusFlags.PartialChain)
{
// On Android, we will fail with PartialChain to build a cert chain
// even if the failure is an untrusted root cert since the underlying platform
// does not provide a way to distinguish the failure.
// In that case, just use the provided cert.
certs.Add(Certificate!);
}
else
{
throw new CryptographicException(SR.Cryptography_Cms_IncompleteCertChain);
if (chain.ChainElements.Count == 0)
{
// On Android, we will fail with PartialChain to build a cert chain
// even if the failure is an untrusted root cert since the underlying platform
// does not provide a way to distinguish the failure.
// In that case, just use the provided cert.
certs.Add(Certificate!);
}
else
{
throw new CryptographicException(SR.Cryptography_Cms_IncompleteCertChain);
}
}
}
}
}

X509ChainElementCollection elements = chain.ChainElements;
int count = elements.Count;
int last = count - 1;

if (last == 0)
{
// If there's always one cert treat it as EE, not root.
last = -1;
}

for (int i = 0; i < count; i++)
{
X509Certificate2 cert = elements[i].Certificate;
X509ChainElementCollection elements = chain.ChainElements;
int count = elements.Count;
int last = count - 1;

if (i == last &&
IncludeOption == X509IncludeOption.ExcludeRoot &&
cert.SubjectName.RawData.AsSpan().SequenceEqual(cert.IssuerName.RawData))
if (last == 0)
{
break;
// If there's always one cert treat it as EE, not root.
last = -1;
}

certs.Add(cert);
for (int i = 0; i < count; i++)
{
X509Certificate2 cert = elements[i].Certificate;

if (i == last &&
IncludeOption == X509IncludeOption.ExcludeRoot &&
cert.SubjectName.RawData.AsSpan().SequenceEqual(cert.IssuerName.RawData))
{
break;
}

certs.Add(cert);
}
}
finally
{
chain.Dispose();
}
}
}
Expand Down
Loading