Skip to content

Enable ML-DSA CMS tests on .NET Framework #131445

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
PranavSenthilnathan merged 4 commits into from
Jul 30, 2026
Merged

Enable ML-DSA CMS tests on .NET Framework #131445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e9bb837
Enable ML-DSA CMS tests on .NET Framework
PranavSenthilnathan Jul 27, 2026
89cc1a2
Correct netfx detached CMS verification test
PranavSenthilnathan Jul 28, 2026
76260d3
Validate netfx CMS SHAKE error codes
PranavSenthilnathan Jul 28, 2026
1bf09f4
Merge branch 'main' into pranavsenthilnathan-mldsa-pkcs8-export-test
bartonjs Jul 29, 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
36 changes: 26 additions & 10 deletions src/libraries/System.Security.Cryptography.Pkcs/tests/SignedCms/SignedCmsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -669,21 +669,37 @@ public static void AddFirstSigner_SlhDsa(SubjectIdentifierType identifierType, b
[MemberData(nameof(AddFirstSignerMLDsaTestData))]
public static void AddFirstSigner_MLDsa(SubjectIdentifierType identifierType, bool detached, string digestOid, MLDsaAlgorithm algorithm)
{
void SignWithMLDsa(SignedCms cms)
{
using (X509Certificate2 signerCert = Certificates.MLDsaIetf[algorithm].TryGetCertificateWithPrivateKey())
{
CmsSigner signer = new CmsSigner(identifierType, signerCert);
signer.IncludeOption = X509IncludeOption.EndCertOnly;
signer.DigestAlgorithm = new Oid(digestOid, digestOid);
cms.ComputeSignature(signer);
}
}

if (PlatformDetection.IsNetFramework && (digestOid == Oids.Shake128 || digestOid == Oids.Shake256))
{
const int CryptEUnknownAlgorithm = unchecked((int)0x80091002);

// .NET Framework's CMS is backed by Windows CAPI, which does not recognize SHAKE
// digest algorithms and fails signing with CRYPT_E_UNKNOWN_ALGO. .NET builds the
// CMS in managed code and succeeds.
ContentInfo contentInfo = new ContentInfo(new byte[] { 9, 8, 7, 6, 5 });
SignedCms cms = new SignedCms(contentInfo, detached);
CryptographicException exception = Assert.Throws<CryptographicException>(() => SignWithMLDsa(cms));
Assert.Equal(CryptEUnknownAlgorithm, exception.HResult);
return;
}

byte[]? signature = null;

AssertAddFirstSigner(
identifierType,
detached,
cms =>
{
using (X509Certificate2 signerCert = Certificates.MLDsaIetf[algorithm].TryGetCertificateWithPrivateKey())
{
CmsSigner signer = new CmsSigner(identifierType, signerCert);
signer.IncludeOption = X509IncludeOption.EndCertOnly;
signer.DigestAlgorithm = new Oid(digestOid, digestOid);
cms.ComputeSignature(signer);
}
},
SignWithMLDsa,
firstSigner =>
{
// Store signature for comparison after roundtrip.
Expand Down
36 changes: 26 additions & 10 deletions src/libraries/System.Security.Cryptography.Pkcs/tests/SignedCms/SignerInfoTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -820,18 +820,34 @@ public static void AddCounterSigner_SlhDsa(SubjectIdentifierType identifierType,
[MemberData(nameof(AddCounterSignerMLDsaTestData))]
public static void AddCounterSigner_MLDsa(SubjectIdentifierType identifierType, string digestOid, MLDsaAlgorithm algorithm)
{
void CounterSignWithMLDsa(SignerInfo signer)
{
using (X509Certificate2 signerCert = Certificates.MLDsaIetf[algorithm].TryGetCertificateWithPrivateKey())
{
CmsSigner counterSigner = new CmsSigner(identifierType, signerCert);
counterSigner.IncludeOption = X509IncludeOption.EndCertOnly;
counterSigner.DigestAlgorithm = new Oid(digestOid, digestOid);
signer.ComputeCounterSignature(counterSigner);
}
}

if (PlatformDetection.IsNetFramework && (digestOid == Oids.Shake128 || digestOid == Oids.Shake256))
{
const int CryptEUnknownAlgorithm = unchecked((int)0x80091002);

// .NET Framework's CMS is backed by Windows CAPI, which does not recognize SHAKE
// digest algorithms and fails signing with CRYPT_E_UNKNOWN_ALGO. .NET builds the
// CMS in managed code and succeeds.
SignedCms cms = new SignedCms();
cms.Decode(SignedDocuments.RsaPkcs1OneSignerIssuerAndSerialNumber);
CryptographicException exception = Assert.Throws<CryptographicException>(() => CounterSignWithMLDsa(cms.SignerInfos[0]));
Assert.Equal(CryptEUnknownAlgorithm, exception.HResult);
return;
}

AssertAddCounterSigner(
identifierType,
signer =>
{
using (X509Certificate2 signerCert = Certificates.MLDsaIetf[algorithm].TryGetCertificateWithPrivateKey())
{
CmsSigner counterSigner = new CmsSigner(identifierType, signerCert);
counterSigner.IncludeOption = X509IncludeOption.EndCertOnly;
counterSigner.DigestAlgorithm = new Oid(digestOid, digestOid);
signer.ComputeCounterSignature(counterSigner);
}
},
CounterSignWithMLDsa,
(cms, counterSigner) =>
{
byte[] signature = counterSigner.GetSignature();
Expand Down
Loading