added support for conversion from EdDSA keys to EdECKeySpec.

Author: dghgit

prov/src/main/jdk1.15/org/bouncycastle/jcajce/provider/asymmetric/edec/KeyFactorySpi.java

@@ -5,12 +5,15 @@
 import java.security.Key;
 import java.security.PrivateKey;
 import java.security.PublicKey;
+import java.security.interfaces.EdECPrivateKey;
+import java.security.interfaces.EdECPublicKey;
 import java.security.spec.EdECPrivateKeySpec;
 import java.security.spec.EdECPublicKeySpec;
 import java.security.spec.InvalidKeySpecException;
 import java.security.spec.KeySpec;
 import java.security.spec.NamedParameterSpec;
 import java.security.spec.X509EncodedKeySpec;
+import java.util.Optional;
 
 import org.bouncycastle.asn1.ASN1Encoding;
 import org.bouncycastle.asn1.ASN1ObjectIdentifier;
@@ -131,6 +134,28 @@ else if (spec.isAssignableFrom(RawEncodedKeySpec.class))
                 return new RawEncodedKeySpec(((EdDSAPublicKey)key).getPointEncoding());
             }
         }
+        else if (spec.isAssignableFrom(EdECPrivateKeySpec.class))
+        {
+            if (key instanceof EdECPrivateKey)
+            {
+                Optional<byte[]> bytes = ((EdECPrivateKey)key).getBytes();
+                if (bytes.isPresent())
+                {
+                    return new EdECPrivateKeySpec(((EdECPrivateKey)key).getParams(), bytes.get());
+                }
+                else
+                {
+                    throw new IllegalArgumentException("no byte[] data associated with key");
+                }
+            }
+        }
+        else if (spec.isAssignableFrom(EdECPublicKeySpec.class))
+        {
+            if (key instanceof EdECPublicKey)
+            {
+                return new EdECPublicKeySpec(((EdECPublicKey)key).getParams(), ((EdECPublicKey)key).getPoint());
+            }
+        }
 
         return super.engineGetKeySpec(key, spec);
     }

prov/src/test/jdk1.15/org/bouncycastle/jcajce/provider/test/EdDSA15Test.java

@@ -15,17 +15,18 @@
 import java.security.spec.AlgorithmParameterSpec;
 import java.security.spec.EdECPrivateKeySpec;
 import java.security.spec.EdECPublicKeySpec;
-import java.security.spec.KeySpec;
 import java.security.spec.NamedParameterSpec;
 import java.util.Base64;
 
+import junit.framework.Assert;
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 import org.bouncycastle.jcajce.interfaces.EdDSAPrivateKey;
 import org.bouncycastle.jcajce.spec.EdDSAParameterSpec;
 import org.bouncycastle.jcajce.spec.RawEncodedKeySpec;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.bouncycastle.util.Arrays;
 import org.bouncycastle.util.Strings;
 
 public class EdDSA15Test
@@ -158,10 +159,10 @@ private void implTestInterop(String algorithm)
         KeyFactory bcKeyFact = KeyFactory.getInstance(algorithm, bc);
         KeyPair kpSunEC = kpGenSunEC.generateKeyPair();
 
-        KeySpec pubSpec = sunKeyFact.getKeySpec(kpSunEC.getPublic(), EdECPublicKeySpec.class);
+        EdECPublicKeySpec pubSpec = sunKeyFact.getKeySpec(kpSunEC.getPublic(), EdECPublicKeySpec.class);
         PublicKey pubKey = bcKeyFact.generatePublic(pubSpec);
 
-        KeySpec privSpec = sunKeyFact.getKeySpec(kpSunEC.getPrivate(), EdECPrivateKeySpec.class);
+        EdECPrivateKeySpec privSpec = sunKeyFact.getKeySpec(kpSunEC.getPrivate(), EdECPrivateKeySpec.class);
         PrivateKey privKey = bcKeyFact.generatePrivate(privSpec);
 
         sigBC.initSign(kpSunEC.getPrivate());
@@ -174,7 +175,7 @@ private void implTestInterop(String algorithm)
 
         sigBC.update(Strings.toByteArray("Hello, world!"));
 
-        sigBC.verify(sig);
+        Assert.assertTrue(sigBC.verify(sig));
 
         sigBC.initSign(privKey);
 
@@ -186,7 +187,18 @@ private void implTestInterop(String algorithm)
 
         sigBC.update(Strings.toByteArray("Hello, world!"));
 
-        sigBC.verify(sig);
+        Assert.assertTrue(sigBC.verify(sig));
+
+        EdECPrivateKeySpec bcPrivSpec = bcKeyFact.getKeySpec(privKey, EdECPrivateKeySpec.class);
+
+        Assert.assertEquals(privSpec.getParams().getName(), bcPrivSpec.getParams().getName());
+        Assert.assertTrue(Arrays.areEqual(privSpec.getBytes(), bcPrivSpec.getBytes()));
+
+        EdECPublicKeySpec bcPubSpec = bcKeyFact.getKeySpec(pubKey, EdECPublicKeySpec.class);
+
+        Assert.assertEquals(pubSpec.getParams().getName(), bcPubSpec.getParams().getName());
+        Assert.assertEquals(pubSpec.getPoint().isXOdd(), bcPubSpec.getPoint().isXOdd());
+        Assert.assertEquals(pubSpec.getPoint().getY(), bcPubSpec.getPoint().getY());
     }
 
     private void implTestInteropCase(KeyPair kp, Signature signer, Signature verifier)