first cut of support for FIDO2 keys.

Author: dghgit

core/src/main/java/org/bouncycastle/crypto/util/OpenSSHPublicKeyUtil.java

@@ -30,6 +30,9 @@ private OpenSSHPublicKeyUtil()
     private static final String ED_25519 = "ssh-ed25519";
     private static final String DSS = "ssh-dss";
 
+    private static final String FIDO2_EC_P256 = "[email protected]";
+    private static final String FIDO_ED_25519 = "[email protected]";
+    
     /**
      * Parse a public key.
      * <p>
@@ -167,6 +170,29 @@ else if (magic.startsWith(ECDSA))
                 curve.decodePoint(pointRaw),
                 new ECNamedDomainParameters(oid, x9ECParameters));
         }
+        else if (magic.equals(FIDO2_EC_P256))
+        {
+            String curveName = buffer.readString();
+
+            ASN1ObjectIdentifier oid = SSHNamedCurves.getByName(curveName);
+            X9ECParameters x9ECParameters = SSHNamedCurves.getParameters(oid);
+
+            if (x9ECParameters == null)
+            {
+                throw new IllegalStateException("unable to find curve for " + magic + " using curve name " + curveName);
+            }
+
+            ECCurve curve = x9ECParameters.getCurve();
+
+            byte[] pointRaw = buffer.readBlock();
+
+            // TODO: at the moment we have no use for this, but it's there.
+            String application = buffer.readString();
+
+            result = new ECPublicKeyParameters(
+                curve.decodePoint(pointRaw),
+                new ECNamedDomainParameters(oid, x9ECParameters));
+        }
         else if (ED_25519.equals(magic))
         {
             byte[] pubKeyBytes = buffer.readBlock();
@@ -177,6 +203,19 @@ else if (ED_25519.equals(magic))
 
             result = new Ed25519PublicKeyParameters(pubKeyBytes, 0);
         }
+        else if (FIDO2_EC_P256.equals(magic))
+        {
+            byte[] pubKeyBytes = buffer.readBlock();
+            if (pubKeyBytes.length != Ed25519PublicKeyParameters.KEY_SIZE)
+            {
+                throw new IllegalStateException("public key value of wrong length");
+            }
+
+            // TODO: at the moment we have no use for this, but it's there.
+            String application = buffer.readString();
+
+            result = new Ed25519PublicKeyParameters(pubKeyBytes, 0);
+        }
 
         if (result == null)
         {

core/src/test/java/org/bouncycastle/crypto/test/OpenSSHKeyParsingTests.java

@@ -294,7 +294,6 @@ public void testECDSA_curvesFromSSHKeyGen()
             doECSigTest(new ECPublicKeyParameters(q, privKey.getParameters()), privKey);
         }
 
-
         for (int i = 0; i != pairs.length; i++)
         {
             String[] pair = pairs[i];
@@ -335,6 +334,14 @@ public void testECDSA_curvesFromSSHKeyGen()
 
     }
 
+    private void testFido2Keys()
+    {
+        // P-256 ECDSA Key
+        byte[] decode = Base64.decode("AAAAInNrLWVjZHNhLXNoYTItbmlzdHAyNTZAb3BlbnNzaC5jb20AAAAIbmlzdHAyNTYAAABBBPnfX2RzzEvD5CEX/0G3LLXrDWjrir9jZ2omSoxNyNT44cSiOP2v/WodnYpQdJsLIZn5bGNI0UxzxTuFzdizrWkAAAAEc3NoOg==");
+
+        CipherParameters xpubSpec = OpenSSHPublicKeyUtil.parsePublicKey(decode);
+    }
+
     private void doECSigTest(CipherParameters pubSpec, CipherParameters privSpec)
     {
         ECDSASigner signer = new ECDSASigner();
@@ -470,6 +477,7 @@ public void performTest()
         testRSA();
         testED25519();
         testFailures();
+        testFido2Keys();
     }
 
     public void testRSA()