coderabbit

Author: mkleene

pom.xml

@@ -17,7 +17,7 @@
         <grpc.version>1.75.0</grpc.version>
         <protobuf.version>4.29.2</protobuf.version>
         <bouncycastle.version>1.82</bouncycastle.version>
-        <bc-fips.version>2.0.1</bc-fips.version>
+        <bc-fips.version>2.1.2</bc-fips.version>
         <bcpkix-fips.version>2.1.11</bcpkix-fips.version>
         <bctls-fips.version>2.1.23</bctls-fips.version>
         <bytebuddy.version>1.18.3</bytebuddy.version>

sdk/src/main/java/io/opentdf/platform/sdk/SDKBuilder.java

@@ -84,7 +84,7 @@ public SDKBuilder sslFactoryFromTrustManager(X509TrustManager trustManager) {
         TrustProvider trustProvider;
         try {
             trustProvider = TrustProvider.fromTrustManager(trustManager);
-        } catch (IOException | GeneralSecurityException e) {
+        } catch (GeneralSecurityException e) {
             throw new SDKException("error creating trust provider", e);
         }
         this.trustManager = trustManager;

sdk/src/main/java/io/opentdf/platform/sdk/TrustProvider.java

@@ -25,8 +25,8 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 
 /**
  * Builds {@link SSLSocketFactory} and {@link X509ExtendedTrustManager} instances for verifying
@@ -92,7 +92,7 @@ public static TrustProvider fromDirectory(String certsDirPath) throws IOExceptio
         return builder.build();
     }
 
-    public static TrustProvider fromTrustManager(X509TrustManager trustManager) throws IOException, GeneralSecurityException {
+    public static TrustProvider fromTrustManager(X509TrustManager trustManager) throws GeneralSecurityException {
         SSLContext sslContext = SSLContext.getInstance("TLS");
         sslContext.init(new KeyManager[0], new TrustManager[]{trustManager}, new SecureRandom());
         return new TrustProvider(sslContext, trustManager);
@@ -120,7 +120,7 @@ private static KeyStore loadKeyStore(InputStream in, char[] password)
         // registered fulfills the request.
         byte[] bytes = in.readAllBytes();
         KeyStoreException last = null;
-        for (String type : Set.of(KeyStore.getDefaultType(), "JKS", "PKCS12")) {
+        for (String type : new HashSet<>(List.of(KeyStore.getDefaultType(), "JKS", "PKCS12"))) {
             try {
                 KeyStore ks = KeyStore.getInstance(type);
                 ks.load(new java.io.ByteArrayInputStream(bytes), password);

sdk/src/test/java/io/opentdf/platform/sdk/ECKeyPairTest.java

@@ -160,7 +160,7 @@ void testECDH()  {
         assertEquals(encodeECPoint, "Al3vx59pBnP8tRxuUFw18aK9ym6rFrxZRhpVQytUQ+Kg");
 
         String publicKey = PemTestUtils.publicKeyFromECPoint(ecPoint,
-                SECP256R1.name());
+                SECP256R1.getCurveName());
         assertArrayEquals(ECKeys.sdkPublicKey.toCharArray(), publicKey.toCharArray());
     }