(ratis-thirdparty) branch master updated: RATIS-2064. Bump Netty to 4.1.109 (#50)

[adoroszlai]

This is an automated email from the ASF dual-hosted git repository.

adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ratis-thirdparty.git


The following commit(s) were added to refs/heads/master by this push:
     new 8ae00d9  RATIS-2064. Bump Netty to 4.1.109 (#50)
8ae00d9 is described below

commit 8ae00d95aee42512638347e6cd90bb18b740de49
Author: Doroszlai, Attila <6454655+adorosz...@users.noreply.github.com>
AuthorDate: Tue Apr 30 09:23:34 2024 +0200

    RATIS-2064. Bump Netty to 4.1.109 (#50)
---
 pom.xml                                            |  2 +-
 .../ratis/thirdparty/demo/common/SslConfig.java    | 25 +++++++++++++++-------
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7511b55..4d4a544 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
 
diff --git 
a/test/src/main/java/org/apache/ratis/thirdparty/demo/common/SslConfig.java 
b/test/src/main/java/org/apache/ratis/thirdparty/demo/common/SslConfig.java
index 2dddc65..3e14e59 100644
--- a/test/src/main/java/org/apache/ratis/thirdparty/demo/common/SslConfig.java
+++ b/test/src/main/java/org/apache/ratis/thirdparty/demo/common/SslConfig.java
@@ -24,15 +24,23 @@ import java.util.List;
 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;
 
@@ -49,7 +57,8 @@ public class SslConfig {
   }
 
   public List<String> getTlsCipherSuitesNoEncryption() {
-    return tlsCipherSuitesNoEncryption;
+    // TODO define list without encrpytion
+    return tlsCipherSuitesWithEncryption;
   }
 
 }