-
Notifications
You must be signed in to change notification settings - Fork 4.8k
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
Manually depad RSAES-PKCS1 on Apple OSes #97738
Conversation
Tagging subscribers to this area: @dotnet/area-system-security, @bartonjs, @vcsjones Issue Detailsnull
|
Tagging subscribers to 'os-ios': @steveisok, @akoeplinger, @kotlarmilos Issue DetailsThis provides a workaround for a behavioral change in the latest macOS update, to keep the platform behaving consistently (and tests passing on fully patched machines).
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Jeremy and I have been talking about this one in another medium. But to translate over the commentary:
- There is a lack of test coverage for this change. The existing rsaes-pkcs1-v1_5 tests are lacking.
- Preliminary tests uncovered an issue.
Also fix the boundary bugs uncovered by those tests.
src/libraries/Common/src/Interop/OSX/System.Security.Cryptography.Native.Apple/Interop.RSA.cs
Show resolved
Hide resolved
src/libraries/Common/src/System/Security/Cryptography/RsaPaddingProcessor.cs
Show resolved
Hide resolved
/azp run runtime-ioslike |
Azure Pipelines successfully started running 1 pipeline(s). |
/backport to release/8.0-staging |
Started backporting to release/8.0-staging: https://github.com/dotnet/runtime/actions/runs/7893244443 |
/backport to release/7.0-staging |
/backport to release/6.0-staging |
Started backporting to release/7.0-staging: https://github.com/dotnet/runtime/actions/runs/7893247431 |
Started backporting to release/6.0-staging: https://github.com/dotnet/runtime/actions/runs/7893248395 |
@bartonjs backporting to release/6.0-staging failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Manually depad RSAES-PKCS1 on Apple OSes
Using index info to reconstruct a base tree...
M src/libraries/Common/src/Interop/OSX/System.Security.Cryptography.Native.Apple/Interop.RSA.cs
M src/libraries/Common/src/System/Security/Cryptography/RsaPaddingProcessor.cs
A src/native/libs/System.Security.Cryptography.Native.Apple/entrypoints.c
A src/native/libs/System.Security.Cryptography.Native.Apple/pal_rsa.c
A src/native/libs/System.Security.Cryptography.Native.Apple/pal_rsa.h
Falling back to patching base and 3-way merge...
Auto-merging src/libraries/Native/Unix/System.Security.Cryptography.Native.Apple/entrypoints.c
Auto-merging src/libraries/Common/src/System/Security/Cryptography/RsaPaddingProcessor.cs
CONFLICT (content): Merge conflict in src/libraries/Common/src/System/Security/Cryptography/RsaPaddingProcessor.cs
Auto-merging src/libraries/Common/src/Interop/OSX/System.Security.Cryptography.Native.Apple/Interop.RSA.cs
CONFLICT (content): Merge conflict in src/libraries/Common/src/Interop/OSX/System.Security.Cryptography.Native.Apple/Interop.RSA.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Manually depad RSAES-PKCS1 on Apple OSes
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128 Please backport manually! |
@bartonjs an error occurred while backporting to release/6.0-staging, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
This provides a workaround for a behavioral change in the latest macOS update, to keep the platform behaving consistently (and tests passing on fully patched machines).