Ed448 anomaly

pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/JcaPGPKeyConverter.java

@@ -370,7 +370,7 @@ else if (ecdhK.getCurveOID().equals(EdECObjectIdentifiers.id_X448))
                 BCPGKey key = publicPk.getKey();
                 if (key instanceof Ed25519PublicBCPGKey)
                 {
-                    return implGetPublicKeyX509(BigIntegers.asUnsignedByteArray(new BigInteger(1, publicPk.getKey().getEncoded())),
+                    return implGetPublicKeyX509(publicPk.getKey().getEncoded(),
                         0, EdECObjectIdentifiers.id_Ed25519, "EdDSA");
                 }
                 else
@@ -382,7 +382,7 @@ else if (ecdhK.getCurveOID().equals(EdECObjectIdentifiers.id_X448))
             // Modern Ed448 (1.3.101.113)
             case PublicKeyAlgorithmTags.Ed448:
             {
-                return implGetPublicKeyX509(BigIntegers.asUnsignedByteArray(new BigInteger(1, publicPk.getKey().getEncoded())),
+                return implGetPublicKeyX509(publicPk.getKey().getEncoded(),
                     0, EdECObjectIdentifiers.id_Ed448, "EdDSA");
             }
             case PublicKeyAlgorithmTags.ELGAMAL_ENCRYPT:

pg/src/test/java/org/bouncycastle/openpgp/test/Ed448AnomalyReproducer.java

@@ -0,0 +1,55 @@
+package org.bouncycastle.openpgp.test;
+
+import org.bouncycastle.bcpg.PublicKeyAlgorithmTags;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.bouncycastle.openpgp.PGPException;
+import org.bouncycastle.openpgp.PGPKeyPair;
+import org.bouncycastle.openpgp.operator.jcajce.JcaPGPKeyConverter;
+import org.bouncycastle.openpgp.operator.jcajce.JcaPGPKeyPair;
+import org.bouncycastle.util.test.SimpleTest;
+
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
+import java.security.PublicKey;
+import java.security.Security;
+import java.util.Date;
+
+public class Ed448AnomalyReproducer
+        extends SimpleTest
+{
+    @Override
+    public String getName() {
+        return "Ed448AnomalyReproducer";
+    }
+
+    @Override
+    public void performTest()
+            throws Exception
+    {
+        JcaPGPKeyConverter jcaPGPKeyConverter = new JcaPGPKeyConverter().setProvider(new BouncyCastleProvider());
+        int failure = 0;
+        for (int total = 0; total < 2000; total++)
+        {
+            Date creationDate = new Date();
+            KeyPairGenerator gen = KeyPairGenerator.getInstance("Ed448", "BC");
+            KeyPair keyPair = gen.generateKeyPair();
+            PGPKeyPair jcaPgpPair = new JcaPGPKeyPair(PublicKeyAlgorithmTags.Ed448, keyPair, creationDate);
+
+            try
+            {
+                PublicKey pubKey = jcaPGPKeyConverter.getPublicKey(jcaPgpPair.getPublicKey()); // fails in ~1/200 of times
+            }
+            catch (PGPException e)
+            {
+                failure++;
+                System.out.println(failure + "/" + total + " (" + (((double)(failure)) / total) * 100 + "%)");
+            }
+        }
+    }
+
+    public static void main(String[] args)
+    {
+        Security.addProvider(new BouncyCastleProvider());
+        runTest(new Ed448AnomalyReproducer());
+    }
+}

prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/edec/BCEdDSAPublicKey.java

@@ -14,6 +14,7 @@
 import org.bouncycastle.jcajce.interfaces.EdDSAPublicKey;
 import org.bouncycastle.util.Arrays;
 import org.bouncycastle.util.Properties;
+import org.bouncycastle.util.encoders.Hex;
 
 public class BCEdDSAPublicKey
     implements EdDSAPublicKey
@@ -54,7 +55,9 @@ else if ((rawData.length - prefixLength) == Ed25519PublicKeyParameters.KEY_SIZE)
         }
         else
         {
-            throw new InvalidKeySpecException("raw key data not recognised");
+            throw new InvalidKeySpecException("raw key data not recognised (prefix mismatch:\n" +
+                    "Expected: " + Hex.toHexString(prefix) + "\n" +
+                    "Got:      " + Hex.toHexString(java.util.Arrays.copyOf(rawData, prefixLength)) + ")");
         }
     }