Skip to content

okhttp: enable TLS 1.3 for servers on Android #12785

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ejona86 wants to merge 1 commit into
base: master
Choose a base branch
from
+2 −2
Open

okhttp: enable TLS 1.3 for servers on Android #12785

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion okhttp/src/main/java/io/grpc/okhttp/OkHttpChannelBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ public static OkHttpChannelBuilder forTarget(String target, ChannelCredentials c
*/
private final boolean useGetForSafeMethods = false;

private static ConnectionSpec initialConnectionSpec() {
static ConnectionSpec initialConnectionSpec() {
return (OkHttpProtocolNegotiator.get() instanceof OkHttpProtocolNegotiator.AndroidNegotiator)
? INTERNAL_DEFAULT_CONNECTION_SPEC
: INTERNAL_LEGACY_CONNECTION_SPEC;
Expand Down
2 changes: 1 addition & 1 deletion okhttp/src/main/java/io/grpc/okhttp/SslSocketFactoryServerCredentials.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ static final class ServerCredentials extends io.grpc.ServerCredentials {
private final ConnectionSpec connectionSpec;

ServerCredentials(SSLSocketFactory factory) {
this(factory, OkHttpChannelBuilder.INTERNAL_LEGACY_CONNECTION_SPEC);
this(factory, OkHttpChannelBuilder.initialConnectionSpec());
}

ServerCredentials(SSLSocketFactory factory, ConnectionSpec connectionSpec) {
Expand Down
Loading