roll back changes on CompositeSignaturesTest

Author: gefeili

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

@@ -770,8 +770,7 @@ else if (tcId.contains("87"))
                 privKey = keyFactory.generatePrivate(new PKCS8EncodedKeySpec(new PrivateKeyInfo(
                     new AlgorithmIdentifier(new ASN1ObjectIdentifier(oidMap.get(tcId))), new DEROctetString(sk)).getEncoded()));
                 certPubKey = cert.getPublicKey();
-                // TODO: the test vectors are out of date
-                // x5cpk = certPubKey.getEncoded();
+                x5cpk = certPubKey.getEncoded();
                 byte[] pkEncoded = SubjectPublicKeyInfo.getInstance(pubKey.getEncoded()).getPublicKeyData().getBytes();
                 TestCase.assertTrue(Arrays.areEqual(pkEncoded, pk));
                 byte[] skEncoded = PrivateKeyInfo.getInstance(privKey.getEncoded()).getPrivateKey().getOctets();

…tle/jcacje/provider/test/AllTests21.java …tle/jcacje/provider/test/AllTests17.javaprov/src/test/jdk17/org/bouncycastle/jcacje/provider/test/AllTests21.java renamed to prov/src/test/jdk17/org/bouncycastle/jcacje/provider/test/AllTests17.java prov/src/test/jdk17/org/bouncycastle/jcacje/provider/test/AllTests21.java renamed to prov/src/test/jdk17/org/bouncycastle/jcacje/provider/test/AllTests17.java

@@ -6,7 +6,7 @@
 import org.bouncycastle.test.PrintTestResult;
 
 
-public class AllTests21
+public class AllTests17
     extends TestCase
 {
     public static void main(String[] args)
@@ -16,7 +16,7 @@ public static void main(String[] args)
 
     public static Test suite()
     {
-        TestSuite suite = new TestSuite("JDK21 Provider Tests");
+        TestSuite suite = new TestSuite("JDK17 Provider Tests");
         suite.addTestSuite(NTRUKEMTest.class);
         suite.addTestSuite(SNTRUPrimeKEMTest.class);
         suite.addTestSuite(MLKEMTest.class);