KEM support for EnvelopedCms - #133046
Merged
Merged
KEM support for EnvelopedCms#133046
Conversation
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
|
Azure Pipelines: Successfully started running 3 pipeline(s). 13 pipeline(s) were filtered out due to trigger conditions. There may be pipelines that require an authorized user to comment /azp run to run. |
Contributor
|
Tagging subscribers to this area: @bartonjs, @vcsjones, @dotnet/area-system-security |
This was referenced Sep 2, 2026
bartonjs
reviewed
Sep 3, 2026
bartonjs
left a comment
Member
There was a problem hiding this comment.
Posting what I have so far since I have to step away for a few hours, or more.
bartonjs
reviewed
Sep 9, 2026
This was referenced Sep 15, 2026
This was referenced Sep 15, 2026
Closed
Closed
vcsjones
marked this pull request as ready for review
September 15, 2026 22:20
|
Azure Pipelines: Successfully started running 3 pipeline(s). 13 pipeline(s) were filtered out due to trigger conditions. There may be pipelines that require an authorized user to comment /azp run to run. |
Contributor
There was a problem hiding this comment.
Copilot review overview
🟡 Changes recommended
The managed KEM KDF is non-conforming and the new public API surface lacks documented API approval.
Get a fresh assessment by requesting another Copilot review.
Review tier: Lite
Findings: 1
Open (1)
What changed in this PR
Adds managed ML-KEM support for EnvelopedCms, including KEM recipient APIs, ASN.1 handling, encryption/decryption, and test coverage. Composite ML-KEM APIs are exposed but unsupported.
Changes:
- Adds KEM recipient models, OIDs, and public APIs.
- Implements managed ML-KEM processing and platform-specific behavior.
- Adds encryption, decryption, interoperability, and unsupported-platform tests.
| File | Summary |
|---|---|
src/libraries/System.Security.Cryptography.Pkcs/tests/System.Security.Cryptography.Pkcs.Tests.csproj |
Includes KEM tests. |
src/libraries/System.Security.Cryptography.Pkcs/tests/Oids.cs |
Adds test OIDs. |
src/libraries/System.Security.Cryptography.Pkcs/tests/EnvelopedCms/MLKemEncryptTests.cs |
Tests ML-KEM encryption and round trips. |
src/libraries/System.Security.Cryptography.Pkcs/tests/EnvelopedCms/MLKemDecryptTests.cs |
Tests ML-KEM decryption. |
src/libraries/System.Security.Cryptography.Pkcs/tests/EnvelopedCms/KemTestDocuments.cs |
Provides KEM test fixtures. |
src/libraries/System.Security.Cryptography.Pkcs/tests/EnvelopedCms/KemNotSupportedTests.cs |
Tests unsupported-platform behavior. |
src/libraries/System.Security.Cryptography.Pkcs/tests/EnvelopedCms/KemGeneralTests.cs |
Tests general KEM behavior. |
src/libraries/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/RecipientInfoType.cs |
Adds the KEM recipient type. |
src/libraries/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/RecipientInfo.cs |
Integrates KEM recipient handling. |
src/libraries/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/KemRecipientInfo.cs |
Adds public KEM recipient metadata. |
src/libraries/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/EnvelopedCms.Kem.cs |
Adds KEM decryption APIs. |
src/libraries/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/EnvelopedCms.cs |
Integrates KEM decryption. |
src/libraries/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/CmsRecipient.cs |
Adds KEM recipient factories. |
src/libraries/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/RecipientInfoAsn.xml.cs |
Generated recipient-choice model. |
src/libraries/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/RecipientInfoAsn.xml |
Defines the recipient choice. |
src/libraries/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/OtherRecipientInfoAsn.xml.cs |
Generated other-recipient model. |
src/libraries/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/OtherRecipientInfoAsn.xml |
Defines other-recipient ASN.1. |
src/libraries/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/KemRecipientInfoAsn.xml.cs |
Generated KEM recipient model. |
src/libraries/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/KemRecipientInfoAsn.xml |
Defines KEM recipient ASN.1. |
src/libraries/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/CmsOriForKemOtherInfoAsn.xml.cs |
Generated KEM metadata model. |
src/libraries/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/Pkcs/Asn1/CmsOriForKemOtherInfoAsn.xml |
Defines KEM metadata ASN.1. |
src/libraries/System.Security.Cryptography.Pkcs/src/System/Security/Cryptography/NetStandardShims.cs |
Provides compatibility shims. |
src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj |
Includes KEM sources. |
src/libraries/System.Security.Cryptography.Pkcs/src/Internal/Cryptography/PkcsHelpers.cs |
Adds KEM algorithm handling. |
src/libraries/System.Security.Cryptography.Pkcs/src/Internal/Cryptography/Pal/Windows/DecryptorPalWindows.Decrypt.cs |
Handles unsupported Windows KEM decryption. |
src/libraries/System.Security.Cryptography.Pkcs/src/Internal/Cryptography/Pal/AnyOS/ManagedPal.KeyTrans.cs |
Updates key transport integration. |
src/libraries/System.Security.Cryptography.Pkcs/src/Internal/Cryptography/Pal/AnyOS/ManagedPal.Kem.cs |
Implements managed KEM operations. |
src/libraries/System.Security.Cryptography.Pkcs/src/Internal/Cryptography/Pal/AnyOS/ManagedPal.Encrypt.cs |
Routes KEM encryption. |
src/libraries/System.Security.Cryptography.Pkcs/src/Internal/Cryptography/Pal/AnyOS/ManagedPal.Decrypt.cs |
Routes KEM decryption. |
src/libraries/System.Security.Cryptography.Pkcs/src/Internal/Cryptography/Pal/AnyOS/ManagedPal.Decode.cs |
Decodes KEM recipients. |
src/libraries/System.Security.Cryptography.Pkcs/src/Internal/Cryptography/KemRecipientInfoPal.cs |
Adds the KEM PAL abstraction. |
src/libraries/System.Security.Cryptography.Pkcs/src/Internal/Cryptography/EnvelopedCmsKey.cs |
Defines supported KEM decryption keys. |
src/libraries/System.Security.Cryptography.Pkcs/src/Internal/Cryptography/DecryptorPal.cs |
Supports union-based private keys. |
src/libraries/System.Security.Cryptography.Pkcs/ref/System.Security.Cryptography.Pkcs.cs |
Adds public KEM API declarations. |
src/libraries/System.Private.CoreLib/src/System/Runtime/CompilerServices/UnionAttribute.cs |
Adjusts union attribute visibility. |
src/libraries/System.Private.CoreLib/src/System/Runtime/CompilerServices/IUnion.cs |
Adjusts union interface visibility. |
src/libraries/Common/src/System/Security/Cryptography/Oids.cs |
Adds KEM-related OIDs. |
This was referenced Sep 16, 2026
bartonjs
approved these changes
Sep 19, 2026
bartonjs
left a comment
Member
There was a problem hiding this comment.
Seems to be down to some test nits. I'm happy with merging this to main (and opening the port to 11) and doing any followup in main alone.
Member
Author
|
/backport to release/11.0 |
Contributor
|
Started backporting to |
4 tasks
artl93
pushed a commit
that referenced
this pull request
Sep 21, 2026
Backport of #133046 to release/11.0 /cc @vcsjones ## Customer Impact - [ ] Customer reported - [X] Found internally This is a post quantum algorithm addition to EnvelopedCms - ML-KEM. ## Regression - [ ] Yes - [X] No ## Testing Existing tests ensure existing functionality continues to pass. New tests were added for the new functionality. ## Risk Low. New functionality and changes to existing functionality is minimal. Co-authored-by: Kevin Jones <kevin@vcsjones.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This implements ML-KEM and Composite ML-KEM API surface for EnvelopedCms. For the managed implementation, this implements ML-KEM entirely per RFC 9936.
What is not in this PR
There are still some open questions on Windows' implementation that may affect this pull request. At the moment it appears they only support SHA256 for the KDF, whereas the managed implementation landed on using SHA384.