Skip to content

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Aug 26, 2021

Backport of #57623 to release/6.0-rc1

/cc @steveisok

Customer Impact

Background: dotnet/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.

Steve Pfister 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
@ghost ghost added the area-System.Security label Aug 26, 2021
@ghost
Copy link

ghost commented Aug 26, 2021

Tagging subscribers to this area: @bartonjs, @vcsjones, @krwq, @GrabYourPitchforks
See info in area-owners.md if you want to be subscribed.

Issue Details

Backport of #57623 to release/6.0-rc1

/cc @steveisok

Customer Impact

Testing

Risk

Author: github-actions[bot]
Assignees: -
Labels:

area-System.Security

Milestone: -

@steveisok steveisok added the Servicing-consider Issue for next servicing release review label Aug 26, 2021
@steveisok steveisok requested a review from marek-safar August 26, 2021 14:56
@akoeplinger akoeplinger added this to the 6.0.0 milestone Aug 26, 2021
@danmoseley danmoseley added the os-maccatalyst MacCatalyst OS label Aug 26, 2021
@Anipik Anipik removed the Servicing-consider Issue for next servicing release review label Aug 27, 2021
@Anipik
Copy link
Contributor

Anipik commented Aug 27, 2021

approved offline

@Anipik Anipik added the Servicing-approved Approved for servicing release label Aug 27, 2021
@Anipik Anipik merged commit 7a1f2a4 into release/6.0-rc1 Aug 27, 2021
@akoeplinger akoeplinger deleted the backport/pr-57623-to-release/6.0-rc1 branch August 28, 2021 22:03
@ghost ghost locked as resolved and limited conversation to collaborators Sep 27, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

area-System.Security os-maccatalyst MacCatalyst OS Servicing-approved Approved for servicing release

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants