Added support for previous generation of Falcon OIDs for key parsing.

Author: dghgit

core/src/main/java/org/bouncycastle/asn1/bc/BCObjectIdentifiers.java

@@ -290,6 +290,10 @@ public interface BCObjectIdentifiers
      * Falcon
      */
     ASN1ObjectIdentifier falcon = bc_sig.branch("7");
+
+    ASN1ObjectIdentifier old_falcon_512 = new ASN1ObjectIdentifier("1.3.9999.3.6");  // falcon.branch("1");
+    ASN1ObjectIdentifier old_falcon_1024 = new ASN1ObjectIdentifier("1.3.9999.3.9"); // falcon.branch("2");
+
     /** 1.3.9999.3.11 OQS_OID_FALCON512 */
     ASN1ObjectIdentifier falcon_512 = new ASN1ObjectIdentifier("1.3.9999.3.11");
     /** 1.3.9999.3.12 OQS_OID_P256_FALCON512 */

core/src/main/java/org/bouncycastle/pqc/crypto/util/PrivateKeyFactory.java

@@ -387,6 +387,13 @@ else if (algOID.equals(BCObjectIdentifiers.falcon_512) || algOID.equals(BCObject
 
             return new FalconPrivateKeyParameters(falconParams, falconKey.getf(), falconKey.getG(), falconKey.getF(), falconKey.getPublicKey().getH());
         }
+        else if (algOID.equals(BCObjectIdentifiers.old_falcon_512) || algOID.equals(BCObjectIdentifiers.old_falcon_1024))
+        {
+            FalconPrivateKey falconKey = FalconPrivateKey.getInstance(keyInfo.parsePrivateKey());
+            FalconParameters falconParams = Utils.falconParamsLookup(algOID);
+
+            return new FalconPrivateKeyParameters(falconParams, falconKey.getf(), falconKey.getG(), falconKey.getF(), falconKey.getPublicKey().getH());
+        }
         else if (algOID.on(BCObjectIdentifiers.pqc_kem_bike))
         {
             byte[] keyEnc = ASN1OctetString.getInstance(keyInfo.parsePrivateKey()).getOctets();

core/src/main/java/org/bouncycastle/pqc/crypto/util/PublicKeyFactory.java

@@ -189,6 +189,8 @@ public class PublicKeyFactory
         converters.put(BCObjectIdentifiers.ntruhrss1373, new NtruConverter());
         converters.put(BCObjectIdentifiers.falcon_512, new FalconConverter());
         converters.put(BCObjectIdentifiers.falcon_1024, new FalconConverter());
+        converters.put(BCObjectIdentifiers.old_falcon_512, new FalconConverter());
+        converters.put(BCObjectIdentifiers.old_falcon_1024, new FalconConverter());
         converters.put(NISTObjectIdentifiers.id_alg_ml_kem_512, new MLKEMConverter());
         converters.put(NISTObjectIdentifiers.id_alg_ml_kem_768, new MLKEMConverter());
         converters.put(NISTObjectIdentifiers.id_alg_ml_kem_1024, new MLKEMConverter());

core/src/main/java/org/bouncycastle/pqc/crypto/util/Utils.java

@@ -241,6 +241,8 @@ class Utils
 
         falconParams.put(BCObjectIdentifiers.falcon_512, FalconParameters.falcon_512);
         falconParams.put(BCObjectIdentifiers.falcon_1024, FalconParameters.falcon_1024);
+        falconParams.put(BCObjectIdentifiers.old_falcon_512, FalconParameters.falcon_512);
+        falconParams.put(BCObjectIdentifiers.old_falcon_1024, FalconParameters.falcon_1024);
 
         mlkemOids.put(MLKEMParameters.ml_kem_512, NISTObjectIdentifiers.id_alg_ml_kem_512);
         mlkemOids.put(MLKEMParameters.ml_kem_768, NISTObjectIdentifiers.id_alg_ml_kem_768);

prov/src/main/java/org/bouncycastle/jce/provider/BouncyCastleProvider.java

@@ -407,13 +407,16 @@ private void loadPQCKeys()
         addKeyInfoConverter(IsaraObjectIdentifiers.id_alg_xmssmt, new XMSSMTKeyFactorySpi());
         addKeyInfoConverter(PKCSObjectIdentifiers.id_alg_hss_lms_hashsig, new LMSKeyFactorySpi());
         addKeyInfoConverter(BCObjectIdentifiers.picnic_key, new PicnicKeyFactorySpi());
-        addKeyInfoConverter(BCObjectIdentifiers.falcon_512, new FalconKeyFactorySpi());
-        addKeyInfoConverter(BCObjectIdentifiers.falcon_1024, new FalconKeyFactorySpi());
 
         addKeyInfoConverter(NISTObjectIdentifiers.id_alg_ml_kem_512, new MLKEMKeyFactorySpi());
         addKeyInfoConverter(NISTObjectIdentifiers.id_alg_ml_kem_768, new MLKEMKeyFactorySpi());
         addKeyInfoConverter(NISTObjectIdentifiers.id_alg_ml_kem_1024, new MLKEMKeyFactorySpi());
 
+        addKeyInfoConverter(BCObjectIdentifiers.old_falcon_512, new FalconKeyFactorySpi(BCObjectIdentifiers.old_falcon_512));
+        addKeyInfoConverter(BCObjectIdentifiers.old_falcon_1024, new FalconKeyFactorySpi(BCObjectIdentifiers.old_falcon_1024));
+        addKeyInfoConverter(BCObjectIdentifiers.falcon_512, new FalconKeyFactorySpi(BCObjectIdentifiers.falcon_512));
+        addKeyInfoConverter(BCObjectIdentifiers.falcon_1024, new FalconKeyFactorySpi(BCObjectIdentifiers.falcon_1024));
+
         addKeyInfoConverter(BCObjectIdentifiers.dilithium2, new DilithiumKeyFactorySpi());
         addKeyInfoConverter(BCObjectIdentifiers.dilithium3, new DilithiumKeyFactorySpi());
         addKeyInfoConverter(BCObjectIdentifiers.dilithium5, new DilithiumKeyFactorySpi());
@@ -591,7 +594,7 @@ public static PrivateKey getPrivateKey(PrivateKeyInfo privateKeyInfo)
         AsymmetricKeyInfoConverter converter = getAsymmetricKeyInfoConverter(privateKeyInfo.getPrivateKeyAlgorithm().getAlgorithm());
 
         if (converter == null)
-        {
+        {      System.err.println("returning null: " + privateKeyInfo.getPrivateKeyAlgorithm().getAlgorithm());
             return null;
         }