Remove dead Windows 7 conditions and inline CheckKeyConsistency in PfxFormatTests#125142
Open
Remove dead Windows 7 conditions and inline CheckKeyConsistency in PfxFormatTests#125142
Conversation
…tTests Co-authored-by: vcsjones <361677+vcsjones@users.noreply.github.com>
Contributor
|
Tagging subscribers to this area: @bartonjs, @vcsjones, @dotnet/area-system-security |
Member
|
This was just incomplete cleanup done in #122907. |
vcsjones
approved these changes
Mar 3, 2026
Contributor
There was a problem hiding this comment.
Pull request overview
Cleans up dead/unreachable Windows 7-specific code paths in PfxFormatTests by removing an always-false condition and simplifying the callback wiring used by ReadMultiPfx.
Changes:
- Removed the dead
OperatingSystem.IsWindows() && !PlatformDetection.IsWindowsbranches (and associated Windows 7 comments). - Eliminated the intermediate
followupdelegate variable. - Passed
CheckKeyConsistencydirectly intoReadMultiPfxcalls.
This was referenced Mar 3, 2026
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.
Description
Two places in
PfxFormatTests.cshad an always-false conditionOperatingSystem.IsWindows() && !PlatformDetection.IsWindowsguardingfollowup = null. Since these can never be true, thefollowupvariable was alwaysCheckKeyConsistencyand never modified.ifblocks and their associated Windows 7 comment blocksAction<X509Certificate2> followupvariableCheckKeyConsistencydirectly toReadMultiPfxcallsBefore:
After: