removed extra references to NIST OIDs.

Author: dghgit

pkix/src/test/java/org/bouncycastle/cert/test/CertTest.java

@@ -105,6 +105,7 @@
 import org.bouncycastle.jcajce.CompositePublicKey;
 import org.bouncycastle.jcajce.provider.asymmetric.compositesignatures.CompositeSignaturesConstants;
 import org.bouncycastle.jcajce.spec.CompositeAlgorithmSpec;
+import org.bouncycastle.jcajce.spec.SLHDSAParameterSpec;
 import org.bouncycastle.jce.X509KeyUsage;
 import org.bouncycastle.jce.interfaces.ECPointEncoder;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
@@ -3619,9 +3620,9 @@ public void checkCreationSPHINCSPlus()
         //
         // set up the keys
         //
-        KeyPairGenerator kpg = KeyPairGenerator.getInstance("SPHINCSPlus", BC);
+        KeyPairGenerator kpg = KeyPairGenerator.getInstance("SLH-DSA", BC);
 
-        kpg.initialize(SPHINCSPlusParameterSpec.sha2_256s, new SecureRandom());
+        kpg.initialize(SLHDSAParameterSpec.slh_dsa_sha2_256f, new SecureRandom());
 
         KeyPair kp = kpg.generateKeyPair();
 
@@ -3672,7 +3673,7 @@ public void checkCreationSPHINCSPlusSimple()
         //
         KeyPairGenerator kpg = KeyPairGenerator.getInstance("SPHINCSPlus", BC);
 
-        kpg.initialize(SPHINCSPlusParameterSpec.sha2_256f, new SecureRandom());
+        kpg.initialize(SPHINCSPlusParameterSpec.haraka_128f, new SecureRandom());
 
         KeyPair kp = kpg.generateKeyPair();
 

prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/SPHINCSPlus.java

@@ -1,7 +1,6 @@
 package org.bouncycastle.pqc.jcajce.provider;
 
 import org.bouncycastle.asn1.bc.BCObjectIdentifiers;
-import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
 import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
 import org.bouncycastle.jcajce.provider.util.AsymmetricAlgorithmProvider;
 import org.bouncycastle.jcajce.provider.util.AsymmetricKeyInfoConverter;
@@ -41,19 +40,6 @@ public void configure(ConfigurableProvider provider)
 
             addSignatureAlgorithm(provider, "SPHINCSPLUS", PREFIX + "SignatureSpi$Direct", BCObjectIdentifiers.sphincsPlus);
 
-            addSignatureAlias(provider, "SPHINCSPLUS", NISTObjectIdentifiers.id_slh_dsa_sha2_128s);
-            addSignatureAlias(provider, "SPHINCSPLUS", NISTObjectIdentifiers.id_slh_dsa_sha2_128f);
-            addSignatureAlias(provider, "SPHINCSPLUS", NISTObjectIdentifiers.id_slh_dsa_sha2_192s);
-            addSignatureAlias(provider, "SPHINCSPLUS", NISTObjectIdentifiers.id_slh_dsa_sha2_192f);
-            addSignatureAlias(provider, "SPHINCSPLUS", NISTObjectIdentifiers.id_slh_dsa_sha2_256s);
-            addSignatureAlias(provider, "SPHINCSPLUS", NISTObjectIdentifiers.id_slh_dsa_sha2_256f);
-            addSignatureAlias(provider, "SPHINCSPLUS", NISTObjectIdentifiers.id_slh_dsa_shake_128s);
-            addSignatureAlias(provider, "SPHINCSPLUS", NISTObjectIdentifiers.id_slh_dsa_shake_128f);
-            addSignatureAlias(provider, "SPHINCSPLUS", NISTObjectIdentifiers.id_slh_dsa_shake_192s);
-            addSignatureAlias(provider, "SPHINCSPLUS", NISTObjectIdentifiers.id_slh_dsa_shake_192f);
-            addSignatureAlias(provider, "SPHINCSPLUS", NISTObjectIdentifiers.id_slh_dsa_shake_256s);
-            addSignatureAlias(provider, "SPHINCSPLUS", NISTObjectIdentifiers.id_slh_dsa_shake_256f);
-
             addSignatureAlias(provider, "SPHINCSPLUS", BCObjectIdentifiers.sphincsPlus_sha2_128f_r3);
             addSignatureAlias(provider, "SPHINCSPLUS", BCObjectIdentifiers.sphincsPlus_shake_128s_r3);
             addSignatureAlias(provider, "SPHINCSPLUS", BCObjectIdentifiers.sphincsPlus_shake_128f_r3);

prov/src/test/java/org/bouncycastle/pqc/jcajce/provider/test/SphincsPlusKeyPairGeneratorTest.java

@@ -9,7 +9,6 @@
 
 import org.bouncycastle.asn1.ASN1ObjectIdentifier;
 import org.bouncycastle.asn1.bc.BCObjectIdentifiers;
-import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
 import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
 import org.bouncycastle.pqc.jcajce.spec.SPHINCSPlusParameterSpec;
 import org.bouncycastle.util.Arrays;
@@ -32,18 +31,6 @@ public void testKeyFactory()
     {
         kf = KeyFactory.getInstance("SPHINCSPlus", "BCPQC");
         kf = KeyFactory.getInstance(BCObjectIdentifiers.sphincsPlus.getId(), "BCPQC");
-        kf = KeyFactory.getInstance(NISTObjectIdentifiers.id_slh_dsa_sha2_128s.getId(), "BCPQC");
-        kf = KeyFactory.getInstance(NISTObjectIdentifiers.id_slh_dsa_sha2_128f.getId(), "BCPQC");
-        kf = KeyFactory.getInstance(NISTObjectIdentifiers.id_slh_dsa_sha2_192s.getId(), "BCPQC");
-        kf = KeyFactory.getInstance(NISTObjectIdentifiers.id_slh_dsa_sha2_192f.getId(), "BCPQC");
-        kf = KeyFactory.getInstance(NISTObjectIdentifiers.id_slh_dsa_sha2_256s.getId(), "BCPQC");
-        kf = KeyFactory.getInstance(NISTObjectIdentifiers.id_slh_dsa_sha2_256f.getId(), "BCPQC");
-        kf = KeyFactory.getInstance(NISTObjectIdentifiers.id_slh_dsa_shake_128s.getId(), "BCPQC");
-        kf = KeyFactory.getInstance(NISTObjectIdentifiers.id_slh_dsa_shake_128f.getId(), "BCPQC");
-        kf = KeyFactory.getInstance(NISTObjectIdentifiers.id_slh_dsa_shake_192s.getId(), "BCPQC");
-        kf = KeyFactory.getInstance(NISTObjectIdentifiers.id_slh_dsa_shake_192f.getId(), "BCPQC");
-        kf = KeyFactory.getInstance(NISTObjectIdentifiers.id_slh_dsa_shake_256s.getId(), "BCPQC");
-        kf = KeyFactory.getInstance(NISTObjectIdentifiers.id_slh_dsa_shake_256f.getId(), "BCPQC");
 
         kf = KeyFactory.getInstance(BCObjectIdentifiers.sphincsPlus_sha2_128f_r3.getId(), "BCPQC");
         kf = KeyFactory.getInstance(BCObjectIdentifiers.sphincsPlus_shake_128s_r3.getId(), "BCPQC");