Skip to content

Commit

Permalink
checkstyle issues fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
beatrausch committed Nov 4, 2021
1 parent 49fd62a commit b861c5e
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions okhttp/src/main/java/io/grpc/okhttp/OkHttpChannelBuilder.java
Expand Up @@ -110,7 +110,7 @@ private enum NegotiationType {
CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
CipherSuite.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
CipherSuite.TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,
CipherSuite.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256)
CipherSuite.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256

// TLS 1.3 does not work so far. See issues:
// https://github.com/grpc/grpc-java/issues/7765
Expand All @@ -119,6 +119,7 @@ private enum NegotiationType {
//CipherSuite.TLS_AES_128_GCM_SHA256,
//CipherSuite.TLS_AES_256_GCM_SHA384,
//CipherSuite.TLS_CHACHA20_POLY1305_SHA256
)
.tlsVersions(/*TlsVersion.TLS_1_3,*/ TlsVersion.TLS_1_2)
.supportsTlsExtensions(true)
.build();
Expand Down Expand Up @@ -422,7 +423,7 @@ public OkHttpChannelBuilder tlsConnectionSpec(
Preconditions.checkNotNull(tlsVersions, "tls versions must not null");
Preconditions.checkNotNull(cipherSuites, "ciphers must not null");

this.connectionSpec = new ConnectionSpec.Builder(true)
this.connectionSpec = new ConnectionSpec.Builder(true)
.supportsTlsExtensions(supportsTlsExtensions)
.tlsVersions(tlsVersions)
.cipherSuites(cipherSuites)
Expand Down

0 comments on commit b861c5e

Please sign in to comment.