corrected SLHDSA lookup (typo in 256f/s)

added guards on fromName methods.

Author: dghgit

pkix/src/main/java/org/bouncycastle/cms/DefaultCMSSignatureAlgorithmNameGenerator.java

@@ -194,14 +194,14 @@ public DefaultCMSSignatureAlgorithmNameGenerator()
         simpleAlgs.put(NISTObjectIdentifiers.id_slh_dsa_sha2_192s, "SLH-DSA-SHA2-192S");
         simpleAlgs.put(NISTObjectIdentifiers.id_slh_dsa_sha2_192f, "SLH-DSA-SHA2-192F");
         simpleAlgs.put(NISTObjectIdentifiers.id_slh_dsa_sha2_256s, "SLH-DSA-SHA2-256S");
-        simpleAlgs.put(NISTObjectIdentifiers.id_slh_dsa_sha2_256s, "SLH-DSA-SHA2-256F");
+        simpleAlgs.put(NISTObjectIdentifiers.id_slh_dsa_sha2_256f, "SLH-DSA-SHA2-256F");
 
         simpleAlgs.put(NISTObjectIdentifiers.id_slh_dsa_shake_128s, "SLH-DSA-SHAKE-128S");
         simpleAlgs.put(NISTObjectIdentifiers.id_slh_dsa_shake_128f, "SLH-DSA-SHAKE-128F");
         simpleAlgs.put(NISTObjectIdentifiers.id_slh_dsa_shake_192s, "SLH-DSA-SHAKE-192S");
         simpleAlgs.put(NISTObjectIdentifiers.id_slh_dsa_shake_192f, "SLH-DSA-SHAKE-192F");
         simpleAlgs.put(NISTObjectIdentifiers.id_slh_dsa_shake_256s, "SLH-DSA-SHAKE-256S");
-        simpleAlgs.put(NISTObjectIdentifiers.id_slh_dsa_shake_256s, "SLH-DSA-SHAKE-256F");
+        simpleAlgs.put(NISTObjectIdentifiers.id_slh_dsa_shake_256f, "SLH-DSA-SHAKE-256F");
 
         simpleAlgs.put(BCObjectIdentifiers.picnic_signature, "Picnic");
     }

prov/src/main/java/org/bouncycastle/jcajce/spec/MLDSAParameterSpec.java

@@ -46,6 +46,18 @@ public String getName()
 
     public static MLDSAParameterSpec fromName(String name)
     {
-        return (MLDSAParameterSpec)parameters.get(Strings.toLowerCase(name));
+        if (name == null)
+        {
+            throw new NullPointerException("name cannot be null");
+        }
+
+        MLDSAParameterSpec parameterSpec = (MLDSAParameterSpec)parameters.get(Strings.toLowerCase(name));
+
+        if (parameterSpec == null)
+        {
+            throw new IllegalArgumentException("unknown parameter name: " + name);
+        }
+
+        return parameterSpec;
     }
 }

prov/src/main/java/org/bouncycastle/jcajce/spec/MLKEMParameterSpec.java

@@ -43,6 +43,18 @@ public String getName()
 
     public static MLKEMParameterSpec fromName(String name)
     {
-        return (MLKEMParameterSpec)parameters.get(Strings.toLowerCase(name));
+        if (name == null)
+        {
+            throw new NullPointerException("name cannot be null");
+        }
+
+        MLKEMParameterSpec parameterSpec = (MLKEMParameterSpec)parameters.get(Strings.toLowerCase(name));
+
+        if (parameterSpec == null)
+        {
+            throw new IllegalArgumentException("unknown parameter name: " + name);
+        }
+        
+        return parameterSpec;
     }
 }

prov/src/main/java/org/bouncycastle/jcajce/spec/SLHDSAParameterSpec.java

@@ -128,6 +128,18 @@ public String getName()
 
     public static SLHDSAParameterSpec fromName(String name)
     {
-        return (SLHDSAParameterSpec)parameters.get(Strings.toLowerCase(name));
+        if (name == null)
+        {
+            throw new NullPointerException("name cannot be null");
+        }
+
+        SLHDSAParameterSpec parameterSpec = (SLHDSAParameterSpec)parameters.get(Strings.toLowerCase(name));
+
+        if (parameterSpec == null)
+        {
+            throw new IllegalArgumentException("unknown parameter name: " + name);
+        }
+
+        return parameterSpec;
     }
 }