updated to specific SLHDSA names.

Author: dghgit

pkix/src/main/java/org/bouncycastle/operator/DefaultAlgorithmNameFinder.java

@@ -46,18 +46,18 @@ public class DefaultAlgorithmNameFinder
         algorithms.put(EACObjectIdentifiers.id_TA_ECDSA_SHA_512, "SHA512WITHCVC-ECDSA");
         algorithms.put(BCObjectIdentifiers.falcon_512, "FALCON");
         algorithms.put(BCObjectIdentifiers.falcon_1024, "FALCON");
-        algorithms.put(NISTObjectIdentifiers.id_slh_dsa_sha2_128s, "SLHDSA");
-        algorithms.put(NISTObjectIdentifiers.id_slh_dsa_sha2_128f, "SLHDSA");
-        algorithms.put(NISTObjectIdentifiers.id_slh_dsa_sha2_192s, "SLHDSA");
-        algorithms.put(NISTObjectIdentifiers.id_slh_dsa_sha2_192f, "SLHDSA");
-        algorithms.put(NISTObjectIdentifiers.id_slh_dsa_sha2_256s, "SLHDSA");
-        algorithms.put(NISTObjectIdentifiers.id_slh_dsa_sha2_256f, "SLHDSA");
-        algorithms.put(NISTObjectIdentifiers.id_slh_dsa_shake_128s, "SLHDSA");
-        algorithms.put(NISTObjectIdentifiers.id_slh_dsa_shake_128f, "SLHDSA");
-        algorithms.put(NISTObjectIdentifiers.id_slh_dsa_shake_192s, "SLHDSA");
-        algorithms.put(NISTObjectIdentifiers.id_slh_dsa_shake_192f, "SLHDSA");
-        algorithms.put(NISTObjectIdentifiers.id_slh_dsa_shake_256s, "SLHDSA");
-        algorithms.put(NISTObjectIdentifiers.id_slh_dsa_shake_256f, "SLHDSA");
+        algorithms.put(NISTObjectIdentifiers.id_slh_dsa_sha2_128s, "SLH-DSA-SHA2-128S");
+        algorithms.put(NISTObjectIdentifiers.id_slh_dsa_sha2_128f, "SLH-DSA-SHA2-128F");
+        algorithms.put(NISTObjectIdentifiers.id_slh_dsa_sha2_192s, "SLH-DSA-SHA2-192S");
+        algorithms.put(NISTObjectIdentifiers.id_slh_dsa_sha2_192f, "SLH-DSA-SHA2-192F");
+        algorithms.put(NISTObjectIdentifiers.id_slh_dsa_sha2_256s, "SLH-DSA-SHA2-256S");
+        algorithms.put(NISTObjectIdentifiers.id_slh_dsa_sha2_256f, "SLH-DSA-SHA2-256F");
+        algorithms.put(NISTObjectIdentifiers.id_slh_dsa_shake_128s, "SLH-DSA-SHAKE-128S");
+        algorithms.put(NISTObjectIdentifiers.id_slh_dsa_shake_128f, "SLH-DSA-SHAKE-128F");
+        algorithms.put(NISTObjectIdentifiers.id_slh_dsa_shake_192s, "SLH-DSA-SHAKE-192S");
+        algorithms.put(NISTObjectIdentifiers.id_slh_dsa_shake_192f, "SLH-DSA-SHAKE-192F");
+        algorithms.put(NISTObjectIdentifiers.id_slh_dsa_shake_256s, "SLH-DSA-SHAKE-256S");
+        algorithms.put(NISTObjectIdentifiers.id_slh_dsa_shake_256f, "SLH-DSA-SHAKE-256F");
 
         algorithms.put(BCObjectIdentifiers.sphincsPlus_sha2_128s_r3, "SPHINCS+");
         algorithms.put(BCObjectIdentifiers.sphincsPlus_sha2_128f_r3, "SPHINCS+");

pkix/src/test/java/org/bouncycastle/operator/test/AllTests.java

@@ -138,18 +138,18 @@ public void testAgainstKnownList()
             new Object[]{NISTObjectIdentifiers.id_dsa_with_sha3_512, "SHA3-512WITHDSA"},
             new Object[]{BCObjectIdentifiers.falcon_512, "FALCON"},
             new Object[]{BCObjectIdentifiers.falcon_1024, "FALCON"},
-            new Object[]{NISTObjectIdentifiers.id_slh_dsa_sha2_128s, "SLHDSA"},
-            new Object[]{NISTObjectIdentifiers.id_slh_dsa_sha2_128f, "SLHDSA"},
-            new Object[]{NISTObjectIdentifiers.id_slh_dsa_sha2_192s, "SLHDSA"},
-            new Object[]{NISTObjectIdentifiers.id_slh_dsa_sha2_192f, "SLHDSA"},
-            new Object[]{NISTObjectIdentifiers.id_slh_dsa_sha2_256s, "SLHDSA"},
-            new Object[]{NISTObjectIdentifiers.id_slh_dsa_sha2_256f, "SLHDSA"},
-            new Object[]{NISTObjectIdentifiers.id_slh_dsa_shake_128s, "SLHDSA"},
-            new Object[]{NISTObjectIdentifiers.id_slh_dsa_shake_128f, "SLHDSA"},
-            new Object[]{NISTObjectIdentifiers.id_slh_dsa_shake_192s, "SLHDSA"},
-            new Object[]{NISTObjectIdentifiers.id_slh_dsa_shake_192f, "SLHDSA"},
-            new Object[]{NISTObjectIdentifiers.id_slh_dsa_shake_256s, "SLHDSA"},
-            new Object[]{NISTObjectIdentifiers.id_slh_dsa_shake_256f, "SLHDSA"},
+            new Object[]{NISTObjectIdentifiers.id_slh_dsa_sha2_128s, "SLH-DSA-SHA2-128S"},
+            new Object[]{NISTObjectIdentifiers.id_slh_dsa_sha2_128f, "SLH-DSA-SHA2-128F"},
+            new Object[]{NISTObjectIdentifiers.id_slh_dsa_sha2_192s, "SLH-DSA-SHA2-192S"},
+            new Object[]{NISTObjectIdentifiers.id_slh_dsa_sha2_192f, "SLH-DSA-SHA2-192F"},
+            new Object[]{NISTObjectIdentifiers.id_slh_dsa_sha2_256s, "SLH-DSA-SHA2-256S"},
+            new Object[]{NISTObjectIdentifiers.id_slh_dsa_sha2_256f, "SLH-DSA-SHA2-256F"},
+            new Object[]{NISTObjectIdentifiers.id_slh_dsa_shake_128s, "SLH-DSA-SHAKE-128S"},
+            new Object[]{NISTObjectIdentifiers.id_slh_dsa_shake_128f, "SLH-DSA-SHAKE-128F"},
+            new Object[]{NISTObjectIdentifiers.id_slh_dsa_shake_192s, "SLH-DSA-SHAKE-192S"},
+            new Object[]{NISTObjectIdentifiers.id_slh_dsa_shake_192f, "SLH-DSA-SHAKE-192F"},
+            new Object[]{NISTObjectIdentifiers.id_slh_dsa_shake_256s, "SLH-DSA-SHAKE-256S"},
+            new Object[]{NISTObjectIdentifiers.id_slh_dsa_shake_256f, "SLH-DSA-SHAKE-256F"},
             new Object[]{BCObjectIdentifiers.sphincsPlus_sha2_128s_r3, "SPHINCS+"},
             new Object[]{BCObjectIdentifiers.sphincsPlus_sha2_128f_r3, "SPHINCS+"},
             new Object[]{BCObjectIdentifiers.sphincsPlus_shake_128s_r3, "SPHINCS+"},