Skip to content

[release/8.0] Fix PKCS#7 and deep XML tests #136200

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
ViveliDuCh merged 2 commits into from
Oct 23, 2026
Merged

[release/8.0] Fix PKCS#7 and deep XML tests #136200

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
da8dbac
Fix PKCS#7 expectations and deep XML test setup
ViveliDuCh Oct 21, 2026
a031fad
Reduce deep XML test depth on release/8.0 to avoid setup timeouts whi…
ViveliDuCh Oct 22, 2026
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
2 changes: 1 addition & 1 deletion src/libraries/System.Security.Cryptography.Xml/tests/EncryptedXmlTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ public static void DeepRootDecryptedXml_Throws()

private static void DecryptDeepXml(bool root)
{
const int Depth = 100000;
const int Depth = 10000;
XmlDocument doc = new XmlDocument { PreserveWhitespace = true };
string plaintext = "<target>" + BuildDeepMarkup(Depth, "x") + "</target>";
doc.LoadXml(root ? plaintext : "<root><data>" + plaintext + "</data></root>");
Expand Down
6 changes: 4 additions & 2 deletions src/libraries/System.Security.Cryptography.Xml/tests/KeyInfoX509DataTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,8 @@ private static void AssertCertificateContentType(X509ContentType contentType, bo
byte[] rawData = new X509Certificate2Collection(certificate).Export(contentType);
if (contentType == X509ContentType.Pkcs7)
{
// The single-certificate importer requires signer information to select a certificate from PKCS#7.
// Windows requires signer information to select a certificate from PKCS#7.
// Unix does not support importing a single certificate from PKCS#7.
SignedCms cms = new SignedCms(new ContentInfo(new byte[] { 1, 2, 3 }));
CmsSigner cmsSigner = new CmsSigner(signingCertificate) { IncludeOption = X509IncludeOption.EndCertOnly };
cms.ComputeSignature(cmsSigner);
Expand Down Expand Up @@ -210,7 +211,8 @@ private static void AssertCertificateContentType(X509ContentType contentType, bo
KeyInfoX509Data loadedData = new KeyInfoX509Data();
SignedXml loadedSignature = new SignedXml(document);

if (contentType == X509ContentType.Cert || allowNonCertificate)
if (contentType == X509ContentType.Cert ||
(allowNonCertificate && (contentType != X509ContentType.Pkcs7 || PlatformDetection.IsWindows)))
{
loadedData.LoadXml(x509Data);
Assert.Equal(certificate.RawData, ((X509Certificate2)Assert.Single(loadedData.Certificates)).RawData);
Expand Down
Loading