Revert "Some tests still failing"

This reverts commit eb9a7d2.

Author: WillChilds-Klein

CMakeLists.txt

@@ -833,6 +833,18 @@ add_custom_target(check-install-via-properties-with-debug
 
     DEPENDS accp-jar tests-jar)
 
+add_custom_target(check-junit-edKeyFactory
+    COMMAND ${TEST_JAVA_EXECUTABLE}
+    -Dcom.amazon.corretto.crypto.provider.registerEdKeyFactory=true
+        ${TEST_RUNNER_ARGUMENTS}
+        --select-class=com.amazon.corretto.crypto.provider.test.EdDSATest
+        --select-class=com.amazon.corretto.crypto.provider.test.EvpKeyFactoryTest
+        --select-class=com.amazon.corretto.crypto.provider.test.EvpSignatureSpecificTest
+        --select-class=com.amazon.corretto.crypto.provider.test.EvpSignatureTest
+        --select-class=com.amazon.corretto.crypto.provider.test.KeyReuseThreadStormTest
+
+    DEPENDS accp-jar tests-jar)
+
 set(check_targets check-recursive-init
     check-install-via-properties
     check-install-via-properties-with-debug
@@ -841,7 +853,8 @@ set(check_targets check-recursive-init
     check-external-lib
     check-junit-AesLazy
     check-junit-AesEager
-    check-junit-DifferentTempDir)
+    check-junit-DifferentTempDir
+    check-junit-edKeyFactory)
 
 if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
   set(check_targets ${check_targets} check-with-jni-flag)

src/com/amazon/corretto/crypto/provider/AmazonCorrettoCryptoProvider.java

@@ -64,6 +64,7 @@ public final class AmazonCorrettoCryptoProvider extends java.security.Provider {
   private final boolean relyOnCachedSelfTestResults;
   private final boolean shouldRegisterEcParams;
   private final boolean shouldRegisterSecureRandom;
+  private final boolean shouldRegisterEdKeyFactory;
   private final boolean shouldRegisterMLDSA;
   private final Utils.NativeContextReleaseStrategy nativeContextReleaseStrategy;
 
@@ -100,8 +101,14 @@ private void buildServiceMap() {
       addService("KeyFactory", "ML-DSA-87", "EvpKeyFactory$MLDSA");
     }
 
-    addService("KeyFactory", "EdDSA", "EvpKeyFactory$EdDSA");
-    addService("KeyFactory", "Ed25519", "EvpKeyFactory$EdDSA");
+    // KeyFactories are used to convert key encodings to Java Key objects. ACCP's KeyFactory for
+    // Ed25519 returns keys of type EvpEdPublicKey and EvpEdPrivateKey that do not implement
+    // EdECKey interface. One should register the KeyFactories from ACCP if they only use the
+    // output of the factories with ACCP's services.
+    if (shouldRegisterEdKeyFactory) {
+      addService("KeyFactory", "EdDSA", "EvpKeyFactory$EdDSA");
+      addService("KeyFactory", "Ed25519", "EvpKeyFactory$EdDSA");
+    }
     addService("KeyPairGenerator", "EdDSA", "EdGen");
     addService("KeyPairGenerator", "Ed25519", "EdGen");
 
@@ -498,6 +505,9 @@ public AmazonCorrettoCryptoProvider() {
     this.shouldRegisterSecureRandom =
         Utils.getBooleanProperty(PROPERTY_REGISTER_SECURE_RANDOM, true);
 
+    this.shouldRegisterEdKeyFactory =
+        Utils.getBooleanProperty(PROPERTY_REGISTER_ED_KEYFACTORY, false);
+
     this.shouldRegisterMLDSA = (!isFips() || isExperimentalFips());
 
     this.nativeContextReleaseStrategy = Utils.getNativeContextReleaseStrategyProperty();
@@ -731,7 +741,7 @@ KeyFactory getKeyFactory(EvpKeyType keyType) {
           return ecFactory;
         case EdDSA:
           if (edFactory == null) {
-            ecFactory = KeyFactory.getInstance(keyType.jceName, this);
+            edFactory = new EdKeyFactory(this);
           }
           return edFactory;
         case MLDSA:
@@ -760,4 +770,12 @@ EvpKey translateKey(Key key, EvpKeyType keyType) throws InvalidKeyException {
       return (EvpKey) getKeyFactory(keyType).translateKey(key);
     }
   }
+
+  // In case the user does not register Ed25519 KeyFactories by ACCP, we still need one to be used
+  // internally.
+  private static class EdKeyFactory extends KeyFactory {
+    EdKeyFactory(final AmazonCorrettoCryptoProvider provider) {
+      super(new EvpKeyFactory.EdDSA(provider), provider, "Ed25519");
+    }
+  }
 }