Update tuweni to 2.0.0 and add ALLOWLIST truststore type (#128)

Consensys · Jan 7, 2022 · 4fa27ca · 4fa27ca
1 parent ff46b59
commit 4fa27ca
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
+## 1.0.25
+### Features Added
+- Update Tuweni libraries to 2.0.0
+- Add ALLOWLIST as Hashicorp TrustStore type.
 
+---
 ## 1.0.24
 ### Bugs Fixed
 - Updated to log4j 2.17.1. Resolves two potential vulnerabilities which are only exploitable when using custom log4j configurations that are either writable by untrusted users or log data from the `ThreadContext`.

diff --git a/gradle/versions.gradle b/gradle/versions.gradle
@@ -51,10 +51,12 @@ dependencyManagement {
       entry 'log4j-slf4j-impl'
     }
 
-    dependency 'org.apache.tuweni:tuweni-bytes:0.10.0'
-    dependency 'org.apache.tuweni:tuweni-crypto:0.10.0'
-    dependency 'org.apache.tuweni:tuweni-net:0.10.0'
-    dependency 'org.apache.tuweni:tuweni-toml:0.10.0'
+    dependencySet(group: 'org.apache.tuweni', version: '2.0.0') {
+      entry 'tuweni-bytes'
+      entry 'tuweni-crypto'
+      entry 'tuweni-net'
+      entry 'tuweni-toml'
+    }
 
     dependency 'org.assertj:assertj-core:3.15.0'
 

diff --git a/...ge/hashicorp/src/main/java/tech/pegasys/signers/hashicorp/HashicorpConnectionFactory.java b/...ge/hashicorp/src/main/java/tech/pegasys/signers/hashicorp/HashicorpConnectionFactory.java
@@ -97,10 +97,11 @@ private void setTrustOptions(
             new PemTrustOptions().addCertPath(tlsOptions.getTrustStorePath().toString()));
         break;
       case WHITELIST:
+      case ALLOWLIST:
         // Tuweni throws an NPE if the trustStorePath has no directory prefix, thus requiring
         // the use of absolutePath.
         httpClientOptions.setTrustOptions(
-            VertxTrustOptions.whitelistServers(
+            VertxTrustOptions.allowlistServers(
                 tlsOptions.getTrustStorePath().toAbsolutePath(), false));
         break;
     }

diff --git a/keystorage/hashicorp/src/main/java/tech/pegasys/signers/hashicorp/TrustStoreType.java b/keystorage/hashicorp/src/main/java/tech/pegasys/signers/hashicorp/TrustStoreType.java
@@ -19,6 +19,7 @@ public enum TrustStoreType {
   JKS(true),
   PKCS12(true),
   WHITELIST(false),
+  ALLOWLIST(false),
   PEM(false);
 
   private boolean passwordRequired;