Skip to content
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.

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

Fix PKCS#12 to use SHA1 MAC #108825

Merged
merged 1 commit into from
Oct 14, 2024
Merged

Fix PKCS#12 to use SHA1 MAC #108825

merged 1 commit into from
Oct 14, 2024

Conversation

vcsjones
Copy link
Member

@vcsjones vcsjones commented Oct 13, 2024

In #108795 I re-encoded two PKCS#12 documents to use 3DES instead of RC2 so they work on platforms that do not have RC2 available. However, the MAC on the PKCS#12 also changed from SHA-1 to SHA-256. Older Windows 10 (pre 1703, I think) does not support SHA-2 algorithms for the MAC, so this puts it back to SHA-1.

In addition, the test failure output for this is not particularly helpful. This changes the test to preserve the original exception thrown instead of swallowing it and failing with "Is Windows 10".

Contributes to #108815.

@vcsjones
Copy link
Member Author

/azp list

This comment was marked as outdated.

@vcsjones vcsjones force-pushed the fix-108815 branch 2 times, most recently from 093a8d7 to 698c06c Compare October 13, 2024 19:20
@vcsjones
Copy link
Member Author

/azp run runtime

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@vcsjones vcsjones marked this pull request as ready for review October 13, 2024 22:51
src/coreclr/jit/morph.cpp Outdated Show resolved Hide resolved
Copy link
Member

@bartonjs bartonjs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM once the unrelated edit is reverted.

@vcsjones vcsjones merged commit f059869 into dotnet:main Oct 14, 2024
82 checks passed
@vcsjones vcsjones deleted the fix-108815 branch October 14, 2024 21:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants