cleaned up use of prototype seed only OID.

Author: dghgit

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

@@ -429,20 +429,7 @@ public interface BCObjectIdentifiers
     ASN1ObjectIdentifier hqc128 = pqc_kem_hqc.branch("1");
     ASN1ObjectIdentifier hqc192 = pqc_kem_hqc.branch("2");
     ASN1ObjectIdentifier hqc256 = pqc_kem_hqc.branch("3");
-
-    /**
-     * ML-KEM/ML-DSA seed parameters algorithms - temporary
-     */
-    //TODO: delete before release
-    ASN1ObjectIdentifier id_id_alg_seed = bc.branch("10");
-
-    ASN1ObjectIdentifier id_id_alg_ml_dsa_44_seed = id_id_alg_seed.branch("1");
-    ASN1ObjectIdentifier id_id_alg_ml_dsa_65_seed = id_id_alg_seed.branch("2");
-    ASN1ObjectIdentifier id_id_alg_ml_dsa_87_seed = id_id_alg_seed.branch("3");
-    ASN1ObjectIdentifier id_id_alg_ml_kem_512_seed = id_id_alg_seed.branch("4");
-    ASN1ObjectIdentifier id_id_alg_ml_kem_768_seed = id_id_alg_seed.branch("5");
-    ASN1ObjectIdentifier id_id_alg_ml_kem_1024_seed = id_id_alg_seed.branch("6");
-
+    
     /**
      * Mayo
      */

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

@@ -284,9 +284,6 @@ class Utils
         mldsaParams.put(NISTObjectIdentifiers.id_ml_dsa_44, MLDSAParameters.ml_dsa_44);
         mldsaParams.put(NISTObjectIdentifiers.id_ml_dsa_65, MLDSAParameters.ml_dsa_65);
         mldsaParams.put(NISTObjectIdentifiers.id_ml_dsa_87, MLDSAParameters.ml_dsa_87);
-        mldsaParams.put(BCObjectIdentifiers.id_id_alg_ml_dsa_44_seed, MLDSAParameters.ml_dsa_44);
-        mldsaParams.put(BCObjectIdentifiers.id_id_alg_ml_dsa_65_seed, MLDSAParameters.ml_dsa_65);
-        mldsaParams.put(BCObjectIdentifiers.id_id_alg_ml_dsa_87_seed, MLDSAParameters.ml_dsa_87);
         mldsaParams.put(NISTObjectIdentifiers.id_hash_ml_dsa_44_with_sha512, MLDSAParameters.ml_dsa_44_with_sha512);
         mldsaParams.put(NISTObjectIdentifiers.id_hash_ml_dsa_65_with_sha512, MLDSAParameters.ml_dsa_65_with_sha512);
         mldsaParams.put(NISTObjectIdentifiers.id_hash_ml_dsa_87_with_sha512, MLDSAParameters.ml_dsa_87_with_sha512);

prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/mldsa/MLDSAKeyFactorySpi.java

@@ -13,7 +13,6 @@
 import java.util.Set;
 
 import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.bc.BCObjectIdentifiers;
 import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
 import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
 import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
@@ -54,9 +53,9 @@ public MLDSAKeyFactorySpi(Set<ASN1ObjectIdentifier> keyOids)
         this.isHashOnly = false;
     }
 
-    public MLDSAKeyFactorySpi(ASN1ObjectIdentifier keyOid, ASN1ObjectIdentifier seedOid)
+    public MLDSAKeyFactorySpi(ASN1ObjectIdentifier keyOid)
     {
-        super(setOf(keyOid, seedOid));
+        super(keyOid);
 
         this.isHashOnly = (keyOid.equals(NISTObjectIdentifiers.id_hash_ml_dsa_44_with_sha512)
             || keyOid.equals(NISTObjectIdentifiers.id_hash_ml_dsa_65_with_sha512)
@@ -227,7 +226,7 @@ public static class MLDSA44
     {
         public MLDSA44()
         {
-            super(NISTObjectIdentifiers.id_ml_dsa_44, BCObjectIdentifiers.id_id_alg_ml_dsa_44_seed);
+            super(NISTObjectIdentifiers.id_ml_dsa_44);
         }
     }
 
@@ -236,7 +235,7 @@ public static class MLDSA65
     {
         public MLDSA65()
         {
-            super(NISTObjectIdentifiers.id_ml_dsa_65, BCObjectIdentifiers.id_id_alg_ml_dsa_65_seed);
+            super(NISTObjectIdentifiers.id_ml_dsa_65);
         }
     }
 
@@ -245,7 +244,7 @@ public static class MLDSA87
     {
         public MLDSA87()
         {
-            super(NISTObjectIdentifiers.id_ml_dsa_87, BCObjectIdentifiers.id_id_alg_ml_dsa_87_seed);
+            super(NISTObjectIdentifiers.id_ml_dsa_87);
         }
     }
 
@@ -263,7 +262,7 @@ public static class HashMLDSA44
     {
         public HashMLDSA44()
         {
-            super(NISTObjectIdentifiers.id_hash_ml_dsa_44_with_sha512, BCObjectIdentifiers.id_id_alg_ml_dsa_44_seed);
+            super(NISTObjectIdentifiers.id_hash_ml_dsa_44_with_sha512);
         }
     }
 
@@ -272,7 +271,7 @@ public static class HashMLDSA65
     {
         public HashMLDSA65()
         {
-            super(NISTObjectIdentifiers.id_hash_ml_dsa_65_with_sha512, BCObjectIdentifiers.id_id_alg_ml_dsa_65_seed);
+            super(NISTObjectIdentifiers.id_hash_ml_dsa_65_with_sha512);
         }
     }
 
@@ -281,7 +280,7 @@ public static class HashMLDSA87
     {
         public HashMLDSA87()
         {
-            super(NISTObjectIdentifiers.id_hash_ml_dsa_87_with_sha512, BCObjectIdentifiers.id_id_alg_ml_dsa_87_seed);
+            super(NISTObjectIdentifiers.id_hash_ml_dsa_87_with_sha512);
         }
     }
 }

prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/util/BaseKeyFactorySpi.java

@@ -7,7 +7,6 @@
 import java.security.spec.KeySpec;
 import java.security.spec.PKCS8EncodedKeySpec;
 import java.security.spec.X509EncodedKeySpec;
-import java.util.HashSet;
 import java.util.Set;
 
 import org.bouncycastle.asn1.ASN1ObjectIdentifier;
@@ -34,16 +33,6 @@ protected BaseKeyFactorySpi(ASN1ObjectIdentifier keyOid)
         this.keyOids = null;
     }
 
-    protected static Set setOf(ASN1ObjectIdentifier oid1, ASN1ObjectIdentifier oid2)
-    {
-        Set hashSet = new HashSet(2);
-
-        hashSet.add(oid1);
-        hashSet.add(oid2);
-
-        return hashSet;
-    }
-
     public PrivateKey engineGeneratePrivate(KeySpec keySpec)
         throws InvalidKeySpecException
     {