Merge: TLS + SNI + proxy => bug #22
Merged
+3
−3
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
Original AOSP/libcore commit from Brian Carlstrom; The SNI at the TLS layer is the hostname of the proxy instead of the hostname in the URL.
| @@ -201,7 +201,7 @@ public SSLSocket setupSecureSocket(SSLSocketFactory sslSocketFactory, | |||
| // Create the wrapper over connected socket. | |||
| sslSocket = (SSLSocket) sslSocketFactory.createSocket(socket, | |||
| address.uriHost, address.uriPort, true /* autoClose */); | |||
| Libcore.makeTlsTolerant(sslSocket, address.socketHost, tlsTolerant); | |||
| Libcore.makeTlsTolerant(sslSocket, address.uriHost, tlsTolerant); | |||
There was a problem hiding this comment.
Note that this is structurally different from AOSP (which doesn't have SPDY).
http://omapzoom.org/?p=platform/libcore.git;a=commitdiff;h=b7705a4629bb74a5bb19d97bf0b4dd4c74cecd9e
JakeWharton
added a commit
that referenced
this pull request
Sep 19, 2012
Merge: TLS + SNI + proxy => bug
This was referenced Jan 28, 2015
This was referenced Jul 7, 2023
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.
Original AOSP/libcore commit from Brian Carlstrom;
The SNI at the TLS layer is the hostname of the proxy instead
of the hostname in the URL.