Adapt to NIST 203..205 and BC beta from 13. Sept 2024

siemens · Sep 18, 2024 · 6029efd · 6029efd
1 parent 24a6f79
commit 6029efd
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 23 deletions.
diff --git a/src/main/java/com/siemens/pki/cmpracomponent/cryptoservices/AlgorithmHelper.java b/src/main/java/com/siemens/pki/cmpracomponent/cryptoservices/AlgorithmHelper.java
@@ -389,8 +389,9 @@ public static Mac getMac(final String macId) throws NoSuchAlgorithmException {
      * @return signature
      * @throws NoSuchAlgorithmException if signatureId is unknown
      */
-    public static Signature getSignature(final String signatureId) throws NoSuchAlgorithmException {
-        return tryWithAllProviders(p -> Signature.getInstance(signatureId, p));
+    public static Signature getSignature(String signatureId) throws NoSuchAlgorithmException {
+    	String internalSigId=signatureId.startsWith("SLH-DSA")?"SLH-DSA":signatureId;
+        return tryWithAllProviders(p -> Signature.getInstance(internalSigId, p));
     }
 
     /**

diff --git a/src/test/java/com/siemens/pki/cmpracomponent/test/framework/TcAlgs.java b/src/test/java/com/siemens/pki/cmpracomponent/test/framework/TcAlgs.java
@@ -24,8 +24,10 @@
 import java.util.List;
 import org.bouncycastle.asn1.bc.BCObjectIdentifiers;
 import org.bouncycastle.asn1.misc.MiscObjectIdentifiers;
+import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
 import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
 
+
 /**
  * provide lists of algoritrhms to test
  */
@@ -36,30 +38,27 @@ private TcAlgs() {}
     public static List<Object[]> getPqSignatureAlgorithms() throws GeneralSecurityException, NoSuchAlgorithmException {
         return Arrays.asList(new Object[][] {
             {
-                "id_Falcon512_ECDSA_P256_SHA256",
+                "id_ml_dsa_44",
                 KeyPairGeneratorFactory.getGenericKeyPairGenerator(
-                        org.bouncycastle.asn1.misc.MiscObjectIdentifiers.id_Falcon512_ECDSA_P256_SHA256)
-            },
-            {"LMS", KeyPairGeneratorFactory.getGenericKeyPairGenerator("LMS")},
-            {
-                "id-alg-hss-lms-hashsig",
-                KeyPairGeneratorFactory.getGenericKeyPairGenerator(PKCSObjectIdentifiers.id_alg_hss_lms_hashsig)
+                		NISTObjectIdentifiers.id_ml_dsa_44)
             },
-            //
             {
-                "SPHINCS+-SHA2-128s",
-                KeyPairGeneratorFactory.getGenericKeyPairGenerator(BCObjectIdentifiers.sphincsPlus_sha2_128f)
+                "id_ml_dsa_65",
+                KeyPairGeneratorFactory.getGenericKeyPairGenerator(
+                		NISTObjectIdentifiers.id_ml_dsa_65)
             },
             {
-                "SPHINCS+-SHAKE-256s",
-                KeyPairGeneratorFactory.getGenericKeyPairGenerator(BCObjectIdentifiers.sphincsPlus_shake_256s)
-            },
-            {"dilithium2", KeyPairGeneratorFactory.getGenericKeyPairGenerator(BCObjectIdentifiers.dilithium2)},
-            {"dilithium3", KeyPairGeneratorFactory.getGenericKeyPairGenerator(BCObjectIdentifiers.dilithium3)},
-            {"dilithium5", KeyPairGeneratorFactory.getGenericKeyPairGenerator(BCObjectIdentifiers.dilithium5)},
-            {"falcon_512", KeyPairGeneratorFactory.getGenericKeyPairGenerator(BCObjectIdentifiers.falcon_512)},
-            {"falcon_1024", KeyPairGeneratorFactory.getGenericKeyPairGenerator(BCObjectIdentifiers.falcon_1024)}
-            //
+                "id_ml_dsa_87",
+                KeyPairGeneratorFactory.getGenericKeyPairGenerator(
+                		NISTObjectIdentifiers.id_ml_dsa_87)
+            },
+			{ "sphincsPlus_sha2_128s", KeyPairGeneratorFactory
+				.getGenericKeyPairGenerator(BCObjectIdentifiers.sphincsPlus_sha2_128s) 
+			},
+			{ "id_slh_dsa_sha2_128s", KeyPairGeneratorFactory
+						.getGenericKeyPairGenerator(NISTObjectIdentifiers.id_slh_dsa_sha2_128s) 
+			},
+	            //
         });
     }
 
@@ -141,8 +140,8 @@ public static List<Object[]> getCompositeAlgorithms() throws GeneralSecurityExce
 
     public static List<Object[]> getKemAlgorithms() throws GeneralSecurityException, NoSuchAlgorithmException {
         return Arrays.asList(new Object[][] {
-            {"KYBER512", KeyPairGeneratorFactory.getGenericKeyPairGenerator(BCObjectIdentifiers.kyber512)},
-            {"KYBER1024", KeyPairGeneratorFactory.getGenericKeyPairGenerator(BCObjectIdentifiers.kyber1024)},
+            {"id_alg_ml_kem_512", KeyPairGeneratorFactory.getGenericKeyPairGenerator(NISTObjectIdentifiers.id_alg_ml_kem_512)},
+            {"id_alg_ml_kem_1024", KeyPairGeneratorFactory.getGenericKeyPairGenerator(NISTObjectIdentifiers.id_alg_ml_kem_1024)},
         });
     }