Harden TLS protocol selection - #576
Merged
Waboodoo merged 2 commits intoAug 11, 2026
Merged
Conversation
Waboodoo
approved these changes
Aug 11, 2026
Waboodoo
left a comment
Owner
There was a problem hiding this comment.
Looks good to me, thanks for the contribution
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary
This revision keeps Conscrypt's generic
TLScontext so TLS 1.3 and future provider-supported protocol versions remain available. The security policy is applied where protocols are actually configured:TLSEnabledSSLSocketFactoryno longer replaces the provider defaults with a closed list that explicitly enabled TLS 1.0 and TLS 1.1.Changes
SSLContext.getInstance("TLS", "Conscrypt")instead of pinning TLS 1.2;configureTLSstructure and project indentation.Compatibility
TLS 1.2 remains supported. TLS 1.3 and future protocols enabled by Conscrypt are not excluded. Endpoints that support only SSLv3, TLS 1.0, or TLS 1.1 will no longer connect through this custom socket factory.
Validation
git diff --checkktlintCheck(local Android Build Tools 36.0.0 installation is missing AAPT, so Gradle cannot configure all modules)This supersedes the initial TLS 1.2 pin, which satisfied the analyzer's literal allowlist but could prevent TLS 1.3 negotiation.