we do not need this

Author: mkleene

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

@@ -34,12 +34,11 @@ public enum ECAlgorithm {
     private KeyPair keyPair;
 
     public ECKeyPair() {
-        this(ECCurve.SECP256R1, ECAlgorithm.ECDH);
+        this(ECCurve.SECP256R1);
     }
 
-    public ECKeyPair(ECCurve curve, ECAlgorithm algorithm) {
+    public ECKeyPair(ECCurve curve) {
         this.curve = Objects.requireNonNull(curve);
-        Objects.requireNonNull(algorithm);
         try {
             KeyPairGenerator generator = KeyPairGenerator.getInstance(EC_ALGORITHM);
             generator.initialize(new ECGenParameterSpec(this.curve.getCurveName()));

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

@@ -17,7 +17,6 @@
 import io.opentdf.platform.kas.PublicKeyResponse;
 import io.opentdf.platform.kas.RewrapRequest;
 import io.opentdf.platform.kas.RewrapResponse;
-import io.opentdf.platform.sdk.Config.KASInfo;
 import io.opentdf.platform.sdk.SDK.KasBadRequestException;
 
 import okhttp3.OkHttpClient;
@@ -127,7 +126,7 @@ public byte[] unwrap(Manifest.KeyAccess keyAccess, String policy,  KeyType sessi
         ECKeyPair ecKeyPair = null;
         if (sessionKeyType.isEc()) {
             var curve = sessionKeyType.getECCurve();
-            ecKeyPair = new ECKeyPair(curve, ECKeyPair.ECAlgorithm.ECDH);
+            ecKeyPair = new ECKeyPair(curve);
             clientPublicKey = ecKeyPair.publicKeyInPEMFormat();
         } else {
             // Initialize the RSA key pair only once and reuse it for future unwrap operations

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

@@ -245,7 +245,7 @@ private Manifest.KeyAccess createKeyAccess(Config.TDFConfig tdfConfig, Config.KA
         private ECKeyWrappedKeyInfo createECWrappedKey(Config.KASInfo kasInfo,
                 byte[] symKey, KeyType keyType) {
             var curveName = keyType.getECCurve();
-            var keyPair = new ECKeyPair(curveName, ECKeyPair.ECAlgorithm.ECDH);
+            var keyPair = new ECKeyPair(curveName);
 
             ECPublicKey kasPubKey;
             try {

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

@@ -124,8 +124,8 @@ void extractPemPubKeyFromX509() throws CertificateException, IOException, NoSuch
 
     @Test
     void createSymmetricKeysWithOtherCurves() {
-        ECKeyPair pubPair = new ECKeyPair(ECCurve.SECP384R1, ECKeyPair.ECAlgorithm.ECDH);
-        ECKeyPair keyPair = new ECKeyPair(ECCurve.SECP384R1, ECKeyPair.ECAlgorithm.ECDH);
+        ECKeyPair pubPair = new ECKeyPair(ECCurve.SECP384R1);
+        ECKeyPair keyPair = new ECKeyPair(ECCurve.SECP384R1);
 
         byte[] sharedSecret = ECKeyPair.computeECDHKey(pubPair.getPublicKey(), keyPair.getPrivateKey());
         byte[] encryptionKey = ECKeyPair.calculateHKDF(ECKeys.salt.getBytes(StandardCharsets.UTF_8), sharedSecret);
@@ -172,7 +172,7 @@ void testECDSA() {
             if (!curve.isSupported()) {
                 continue;
             }
-            ECKeyPair keyPair = new ECKeyPair(curve, ECKeyPair.ECAlgorithm.ECDSA);
+            ECKeyPair keyPair = new ECKeyPair(curve);
             byte[] signature = ECKeyPair.computeECDSASig(plainText.getBytes(), keyPair.getPrivateKey());
             boolean verify = ECKeyPair.verifyECDSAig(plainText.getBytes(), signature, keyPair.getPublicKey());
             assertEquals(verify, true);