Skip to content

Commit

Permalink
RATIS-2064. Bump Netty to 4.1.109 (#50)
Browse files Browse the repository at this point in the history
  • Loading branch information
adoroszlai authored Apr 30, 2024
1 parent ed5fb52 commit 8ae00d9
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 9 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
<!--Version of grpc to be shaded -->
<shaded.grpc.version>1.58.0</shaded.grpc.version>
<!--Version of Netty to be shaded -->
<shaded.netty.version>4.1.100.Final</shaded.netty.version>
<shaded.netty.version>4.1.109.Final</shaded.netty.version>
<!--Version of dropwizard to be shaded -->
<shaded.dropwizard.version>4.2.21</shaded.dropwizard.version>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,23 @@
public class SslConfig {
// TODO: allow configure cipher suites
private final List<String> tlsCipherSuitesWithEncryption = Collections.unmodifiableList(Arrays.asList(
"TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384",
"TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256",
"TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",
"TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384",
"TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA",
"TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA",
"TLS_RSA_WITH_AES_128_GCM_SHA256",
"TLS_RSA_WITH_AES_128_CBC_SHA",
"SSL_RSA_WITH_3DES_EDE_CBC_SHA"));

// "RSA" in this case refers to the key exchange algorithm,
// "SHA" refers to the message digest algorithm to provide integrity
// "NULL" is the encryption algorithm, to disable encryption.
// TODO: support NULL cipher from tcnative
private final List<String> tlsCipherSuitesNoEncryption = Collections.singletonList("TLS_RSA_WITH_AES_128_GCM_SHA256");
"TLS_RSA_WITH_AES_256_CBC_SHA",
"TLS_AES_128_GCM_SHA256",
"TLS_AES_256_GCM_SHA384",
"TLS_AES_128_GCM_SHA256",
"TLS_AES_256_GCM_SHA384",
"TLS_AES_128_GCM_SHA256",
"TLS_AES_256_GCM_SHA384",
"TLS_CHACHA20_POLY1305_SHA256"
));

private final boolean encryption;

Expand All @@ -49,7 +57,8 @@ public List<String> getTlsCipherSuitesWithEncryption() {
}

public List<String> getTlsCipherSuitesNoEncryption() {
return tlsCipherSuitesNoEncryption;
// TODO define list without encrpytion
return tlsCipherSuitesWithEncryption;
}

}

0 comments on commit 8ae00d9

Please sign in to comment.