Add AsymmetricAlgorithmProvider.addKEMAlgorithm

- use with ML-KEM (ensures ".OID." aliases are registered)

Author: peterdettman

prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/MLKEM.java

@@ -57,16 +57,10 @@ public void configure(ConfigurableProvider provider)
             {
                 // "This algorithm supports keys with ML-KEM-512, ML-KEM-768, and ML-KEM-1024 parameter sets."
                 provider.addAlgorithm("KEM.ML-KEM", PREFIX + "MLKEMSpi$MLKEM");
-                // "[..] (ML-KEM) using the ML-KEM-512 parameter set [..]."
-                provider.addAlgorithm("KEM.ML-KEM-512", PREFIX + "MLKEMSpi$MLKEM512");
-                // "[..] (ML-KEM) using the ML-KEM-768 parameter set [..]."
-                provider.addAlgorithm("KEM.ML-KEM-768", PREFIX + "MLKEMSpi$MLKEM768");
-                // "[..] (ML-KEM) using the ML-KEM-1024 parameter set [..]."
-                provider.addAlgorithm("KEM.ML-KEM-1024", PREFIX + "MLKEMSpi$MLKEM1024");
 
-                provider.addAlgorithm("Alg.Alias.KEM." + NISTObjectIdentifiers.id_alg_ml_kem_512, "ML-KEM-512");
-                provider.addAlgorithm("Alg.Alias.KEM." + NISTObjectIdentifiers.id_alg_ml_kem_768, "ML-KEM-768");
-                provider.addAlgorithm("Alg.Alias.KEM." + NISTObjectIdentifiers.id_alg_ml_kem_1024, "ML-KEM-1024");
+                addKEMAlgorithm(provider, "ML-KEM-512", PREFIX + "MLKEMSpi$MLKEM512", NISTObjectIdentifiers.id_alg_ml_kem_512);
+                addKEMAlgorithm(provider, "ML-KEM-768", PREFIX + "MLKEMSpi$MLKEM768", NISTObjectIdentifiers.id_alg_ml_kem_768);
+                addKEMAlgorithm(provider, "ML-KEM-1024", PREFIX + "MLKEMSpi$MLKEM1024", NISTObjectIdentifiers.id_alg_ml_kem_1024);
             }
         }
     }

prov/src/main/java/org/bouncycastle/jcajce/provider/util/AsymmetricAlgorithmProvider.java

@@ -147,6 +147,20 @@ protected void addCipherAlgorithm(
         }
     }
 
+    protected void addKEMAlgorithm(
+        ConfigurableProvider provider,
+        String algorithm,
+        String className,
+        ASN1ObjectIdentifier oid)
+    {
+        provider.addAlgorithm("KEM." + algorithm, className);
+        if (oid != null)
+        {
+            provider.addAlgorithm("Alg.Alias.KEM." + oid, algorithm);
+            provider.addAlgorithm("Alg.Alias.KEM.OID." + oid, algorithm);
+        }
+    }
+
     protected void registerKeyFactoryOid(ConfigurableProvider provider, ASN1ObjectIdentifier oid, String name, AsymmetricKeyInfoConverter keyFactory)
     {
         provider.addAlgorithm("Alg.Alias.KeyFactory." + oid, name);