Check that re-setting a signature context or the PSS parameters clears the cached AlgorithmParameters, and move SignatureSetParameterTest to the jcajce provider test package as it uses nothing from BCPQC, relates to github #2396.

Author: dghgit

prov/src/test/java/org/bouncycastle/jcajce/provider/test/AllTests.java

@@ -39,6 +39,7 @@ public static Test suite()
         suite.addTestSuite(ECRSAKeyDestructionTest.class);
         suite.addTestSuite(SecretKeyUtilTest.class);
         suite.addTestSuite(PKCS12PBMAC1StoreTest.class);
+        suite.addTestSuite(SignatureSetParameterTest.class);
 
         return new BCTestSetup(suite);
     }

…ider/test/SignatureSetParameterTest.java …ider/test/SignatureSetParameterTest.javaprov/src/test/java/org/bouncycastle/pqc/jcajce/provider/test/SignatureSetParameterTest.java renamed to prov/src/test/java/org/bouncycastle/jcajce/provider/test/SignatureSetParameterTest.java prov/src/test/java/org/bouncycastle/pqc/jcajce/provider/test/SignatureSetParameterTest.java renamed to prov/src/test/java/org/bouncycastle/jcajce/provider/test/SignatureSetParameterTest.java

@@ -1,11 +1,13 @@
-package org.bouncycastle.pqc.jcajce.provider.test;
+package org.bouncycastle.jcajce.provider.test;
 
 import java.security.AlgorithmParameters;
 import java.security.KeyPair;
 import java.security.KeyPairGenerator;
 import java.security.ProviderException;
 import java.security.Security;
 import java.security.Signature;
+import java.security.spec.MGF1ParameterSpec;
+import java.security.spec.PSSParameterSpec;
 
 import junit.framework.TestCase;
 import org.bouncycastle.jcajce.spec.ContextParameterSpec;
@@ -219,6 +221,62 @@ public void testResetContext()
         assertTrue(verifier.verify(s));
     }
 
+    /**
+     * getParameters() caches the AlgorithmParameters it builds, so a context set after it has been
+     * asked for once has to clear that cache rather than go on reporting the previous context.
+     * <p>
+     * testResetContext above only asks after the second setParameter, so the cache is never
+     * populated with the first context there and a stale one would go unnoticed.
+     * </p>
+     */
+    public void testGetParametersNotStaleAfterReset()
+        throws Exception
+    {
+        byte[] second = Strings.toByteArray("second context");
+
+        KeyPair kp = KeyPairGenerator.getInstance("ML-DSA-65", "BC").generateKeyPair();
+
+        Signature sig = Signature.getInstance("ML-DSA", "BC");
+
+        sig.setParameter(new ContextParameterSpec(CONTEXT));
+        sig.initSign(kp.getPrivate());
+
+        assertTrue(Arrays.areEqual(CONTEXT,
+            sig.getParameters().getParameterSpec(ContextParameterSpec.class).getContext()));
+
+        sig.setParameter(new ContextParameterSpec(second));
+
+        assertTrue("getParameters() still reported the previous context", Arrays.areEqual(second,
+            sig.getParameters().getParameterSpec(ContextParameterSpec.class).getContext()));
+    }
+
+    /**
+     * The RSASSA-PSS services cache getParameters() the same way, so the same question is asked of
+     * the sibling path this class's contract is modelled on.
+     */
+    public void testPssGetParametersNotStaleAfterReset()
+        throws Exception
+    {
+        KeyPairGenerator kpg = KeyPairGenerator.getInstance("RSA", "BC");
+
+        kpg.initialize(2048);
+
+        KeyPair kp = kpg.generateKeyPair();
+
+        Signature sig = Signature.getInstance("SHA256withRSAandMGF1", "BC");
+
+        sig.initSign(kp.getPrivate());
+        sig.setParameter(new PSSParameterSpec("SHA-256", "MGF1", MGF1ParameterSpec.SHA256, 32, 1));
+
+        assertEquals(32,
+            ((PSSParameterSpec)sig.getParameters().getParameterSpec(PSSParameterSpec.class)).getSaltLength());
+
+        sig.setParameter(new PSSParameterSpec("SHA-256", "MGF1", MGF1ParameterSpec.SHA256, 20, 1));
+
+        assertEquals("getParameters() still reported the previous salt length", 20,
+            ((PSSParameterSpec)sig.getParameters().getParameterSpec(PSSParameterSpec.class)).getSaltLength());
+    }
+
     public void testSetParameterMidUpdateStillRejected()
         throws Exception
     {

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

@@ -69,7 +69,6 @@ public static Test suite()
         suite.addTestSuite(NamedKeyPairGeneratorTest.class);
         suite.addTestSuite(NamedKeyFactoryTest.class);
         suite.addTestSuite(PreHashKeyInteropTest.class);
-        suite.addTestSuite(SignatureSetParameterTest.class);
         suite.addTestSuite(MayoKeyPairGeneratorTest.class);
         suite.addTestSuite(MayoTest.class);
         suite.addTestSuite(SnovaTest.class);