Restore calls to CreateFatalHandshakeAlertToken on Android #118765
Merged
Conversation
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
|
/azp run runtime-extra-platforms |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
Tagging subscribers to this area: @dotnet/ncl, @bartonjs, @vcsjones |
There was a problem hiding this comment.
Pull Request Overview
This PR fixes a regression introduced in PR #117428 that incorrectly assumed Android's SslStream behavior was identical to Linux/OSX regarding custom alert generation. The fix restores proper handshake teardown behavior on Android by setting CanGenerateCustomAlerts = true and removing an incorrect assertion.
Key changes:
- Restores
CanGenerateCustomAlerts = truefor Android to enable proper handshake teardown - Removes incorrect debug assertion that was causing issues
- Adds explanatory comment about Android's unique handshake requirements
You can also share your feedback on Copilot code review for a chance to win a $100 gift card. Take the survey.
src/libraries/System.Net.Security/src/System/Net/Security/SslStreamPal.Android.cs
Show resolved
Hide resolved
liveans
approved these changes
Aug 15, 2025
|
Affected tests pass now, other CI failures should be unreltaed. |
|
/ba-g failing test is #118770 and is unrelated |
davidnguyen-tech
added a commit
to davidnguyen-tech/runtime
that referenced
this pull request
Aug 15, 2025
davidnguyen-tech
added a commit
that referenced
this pull request
Aug 18, 2025
* Enable smoke tests fixed in #118765 * Fix duplicate include
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
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.
Fixes #118118
Fixes #117963
Fixes #118350
#117428 Introduced some PAL constants to adjust SslStream behavior with regards to sending custom alerts. The PR assumed that since SslStreamPal.ApplyAlertToken is a no-op (due to no API for creating custom alert being available), the entire SslStream.CreateFatalHandshakeAlertToken would be no-op as well. This was the case on Linux and OSX, but not so on Android.
To avoid a regression in .NET 10, this PR restores the call to CreateFatalHandshakeAlertToken, but ideally, the code should be examined as to why the last call to SslStream.HandshakeInternal is needed (as any internally generated alerts should've been returned as part of the previous call).