[release/6.0-rc1] [MacCatalyst] Make AppleCryptoNative_SslSetEnabledCipherSuites check for 32 bit & 16 bit SSLCipherSuite #58182
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
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
added 2 commits
August 26, 2021 14:49
…for 32 bit & 16 bit SSLCipherSuite According to CipherSuites.h, SSLCipherSuite is a 16 bit value on iOS/tvOS x64 & arm64, but on MacCatalyst that is only true on arm64. x64 is defined as 32 bit. ``` /* 16-bit value on iOS */ typedef uint16_t SSLCipherSuite; /* 32-bit value elsewhere */ typedef uint32_t SSLCipherSuite; ``` Fixes #53120
|
Tagging subscribers to this area: @bartonjs, @vcsjones, @krwq, @GrabYourPitchforks Issue DetailsBackport of #57623 to release/6.0-rc1 /cc @steveisok Customer ImpactTestingRisk
|
Anipik
approved these changes
Aug 27, 2021
|
approved offline |
ghost
locked as resolved and limited conversation to collaborators
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Backport of #57623 to release/6.0-rc1
/cc @steveisok
Customer Impact
Background: xamarin/xamarin-macios#11498
The size of the SSLCipherSuite enum differs by platform. For MacCatalyst we currently always assume that it's 16-bit which is correct on arm64 [but wrong in the system headers]. For x64 it should be 32-bit [and it's definited correctly in the system headers].
Testing
Verified the right enum gets chosen for arm64 and x64 on MacCatalyst
Risk
Low. It would be broken on MacCatalyst x64 anyhow.