moved MLKEM into regular provider package to correspond to class for …

…replacement, filled in missing entries
bcgit · Aug 23, 2024 · 547d9d3 · 547d9d3
1 parent 1fc6958
commit 547d9d3
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/...uncycastle/pqc/jcajce/provider/MLKEM.java → ...tle/jcajce/provider/asymmetric/MLKEM.java b/...uncycastle/pqc/jcajce/provider/MLKEM.java → ...tle/jcajce/provider/asymmetric/MLKEM.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.pqc.jcajce.provider;
+package org.bouncycastle.jcajce.provider.asymmetric;
 
 import org.bouncycastle.asn1.ASN1ObjectIdentifier;
 import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
@@ -9,7 +9,7 @@
 
 public class MLKEM
 {
-    private static final String PREFIX = "org.bouncycastle.pqc.jcajce.provider" + ".mlkem.";
+    private static final String PREFIX = "org.bouncycastle.jcajce.provider.asymmetric" + ".mlkem.";
 
     public static class Mappings
             extends AsymmetricAlgorithmProvider
@@ -26,7 +26,6 @@ public void configure(ConfigurableProvider provider)
             addKeyFactoryAlgorithm(provider, "ML-KEM-768", PREFIX + "MLKEMKeyFactorySpi$MLKEM768", NISTObjectIdentifiers.id_alg_ml_kem_768, new MLKEMKeyFactorySpi.MLKEM768());
             addKeyFactoryAlgorithm(provider, "ML-KEM-1024", PREFIX + "MLKEMKeyFactorySpi$MLKEM1024", NISTObjectIdentifiers.id_alg_ml_kem_1024, new MLKEMKeyFactorySpi.MLKEM1024());
 
-
             provider.addAlgorithm("KeyPairGenerator.ML-KEM", PREFIX + "MLKEMKeyPairGeneratorSpi");
 
             addKeyPairGeneratorAlgorithm(provider, "ML-KEM-512", PREFIX + "MLKEMKeyPairGeneratorSpi$MLKEM512", NISTObjectIdentifiers.id_alg_ml_kem_512);
@@ -48,10 +47,14 @@ public void configure(ConfigurableProvider provider)
             addCipherAlgorithm(provider, "ML-KEM-768", PREFIX + "MLKEMCipherSpi$MLKEM768", NISTObjectIdentifiers.id_alg_ml_kem_768);
             addCipherAlgorithm(provider, "ML-KEM-1024", PREFIX + "MLKEMCipherSpi$MLKEM1024", NISTObjectIdentifiers.id_alg_ml_kem_1024);
 
-            registerOid(provider, (ASN1ObjectIdentifier) null, "ML-KEM", keyFact);
-
+            provider.addKeyInfoConverter(NISTObjectIdentifiers.id_alg_ml_kem_512, keyFact);
+            provider.addKeyInfoConverter(NISTObjectIdentifiers.id_alg_ml_kem_768, keyFact);
+            provider.addKeyInfoConverter(NISTObjectIdentifiers.id_alg_ml_kem_1024, keyFact);
+
             provider.addAlgorithm("Kem.ML-KEM", PREFIX + "MLKEMSpi");
-            provider.addAlgorithm("Alg.Alias.Kem", "ML-KEM");
+            provider.addAlgorithm("Alg.Alias.Kem." + NISTObjectIdentifiers.id_alg_ml_kem_512, "ML-KEM");
+            provider.addAlgorithm("Alg.Alias.Kem." + NISTObjectIdentifiers.id_alg_ml_kem_768, "ML-KEM");
+            provider.addAlgorithm("Alg.Alias.Kem." + NISTObjectIdentifiers.id_alg_ml_kem_1024, "ML-KEM");
         }
     }
 }
diff --git a/.../provider/mlkem/MLKEMDecapsulatorSpi.java → ...symmetric/mlkem/MLKEMDecapsulatorSpi.java b/.../provider/mlkem/MLKEMDecapsulatorSpi.java → ...symmetric/mlkem/MLKEMDecapsulatorSpi.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.pqc.jcajce.provider.mlkem;
+package org.bouncycastle.jcajce.provider.asymmetric.mlkem;
 
 import org.bouncycastle.jcajce.provider.asymmetric.mlkem.BCMLKEMPrivateKey;
 import org.bouncycastle.jcajce.spec.KTSParameterSpec;

diff --git a/.../provider/mlkem/MLKEMEncapsulatorSpi.java → ...symmetric/mlkem/MLKEMEncapsulatorSpi.java b/.../provider/mlkem/MLKEMEncapsulatorSpi.java → ...symmetric/mlkem/MLKEMEncapsulatorSpi.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.pqc.jcajce.provider.mlkem;
+package org.bouncycastle.jcajce.provider.asymmetric.mlkem;
 
 import org.bouncycastle.crypto.SecretWithEncapsulation;
 import org.bouncycastle.jcajce.provider.asymmetric.mlkem.BCMLKEMPublicKey;

diff --git a/...e/pqc/jcajce/provider/mlkem/MLKEMSpi.java → ...e/provider/asymmetric/mlkem/MLKEMSpi.java b/...e/pqc/jcajce/provider/mlkem/MLKEMSpi.java → ...e/provider/asymmetric/mlkem/MLKEMSpi.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.pqc.jcajce.provider.mlkem;
+package org.bouncycastle.jcajce.provider.asymmetric.mlkem;
 
 import org.bouncycastle.jcajce.provider.asymmetric.mlkem.BCMLKEMPrivateKey;
 import org.bouncycastle.jcajce.provider.asymmetric.mlkem.BCMLKEMPublicKey;