ML-KEM: Fix checking encapsulation key size #114574
Merged
Conversation
This file contains 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
There was a problem hiding this comment.
Pull Request Overview
This PR aims to fix the encapsulation key size check in ML-KEM by rejecting keys with incorrect sizes and enhancing negative test coverage for the SPKI import functionality.
- Added new tests in MLKemTests.cs to validate incorrect algorithm, parameters, and key sizes.
- Updated MLKem.ImportSubjectPublicKeyInfo to throw a CryptographicException when the encapsulation key size does not match the expected length.
Reviewed Changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| src/libraries/Common/tests/System/Security/Cryptography/MLKemTests.cs | Added tests for invalid SPKI scenarios to improve negative test coverage. |
| src/libraries/Common/src/System/Security/Cryptography/MLKem.cs | Updated key size validation logic in the SPKI import method. |
src/libraries/Common/tests/System/Security/Cryptography/MLKemTests.cs
Outdated
Show resolved
Hide resolved
|
Tagging subscribers to this area: @dotnet/area-system-security, @bartonjs, @vcsjones |
vcsjones
force-pushed
the
fix-ml-kem-spki-imports
branch
from
00f1e7a to
87122a7
Compare
vcsjones
commented
Apr 11, 2025
src/libraries/Common/tests/System/Security/Cryptography/MLKemTests.cs
Outdated
Show resolved
Hide resolved
bartonjs
reviewed
Apr 11, 2025
|
The fix itself looks good, but awaiting resolution of the P8 question in case the answer to that is a large change :) |
bartonjs
approved these changes
Apr 12, 2025
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.
Looking through some coverage reports,
ImportSubjectPublicKeyInfodidn't have adequate test coverage for negative test cases. This lead to the discovery that an incorrectly sized encapsulation key would make it all the way down to the native shim.This change more eagerly rejects incorrectly sized encapsulation keys, and adds more SPKI negative test cases.
Contributes to #113508