Added BCKey to BCPQCKeys, fixed CertTest, and CompositeSignaturesTest

Author: royb

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

@@ -5741,8 +5741,7 @@ public void performTest()
         checkCRLCreation3();
         checkCRLCreation4();
         checkCRLCreation5();
-        //TODO: NOT WORKING CHECK WHY, PQCBC BEING USED RATHER THAN BC?
-//        checkCRLCompositeCreation();
+        checkCRLCompositeCreation();
         checkCrlECDSAwithDilithiumCreation();
 
         pemTest();
@@ -5759,8 +5758,7 @@ public void performTest()
 
         checkSerialisation();
 
-        //TODO: NOT WORKING CHECK WHY, PQCBC BEING USED RATHER THAN BC?
-//        checkCompositeSignatureCertificateCreation();
+        checkCompositeSignatureCertificateCreation();
         checkParseCompositePublicKey();
 //        checkParseCompositePrivateKey();
         checkParseAndVerifyCompositeCertificate();

prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/mldsa/BCMLDSAPrivateKey.java

@@ -6,6 +6,7 @@
 
 import org.bouncycastle.asn1.ASN1Set;
 import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
+import org.bouncycastle.jcajce.interfaces.BCKey;
 import org.bouncycastle.jcajce.interfaces.MLDSAPrivateKey;
 import org.bouncycastle.jcajce.interfaces.MLDSAPublicKey;
 import org.bouncycastle.jcajce.spec.MLDSAParameterSpec;
@@ -19,7 +20,7 @@
 import org.bouncycastle.util.encoders.Hex;
 
 public class BCMLDSAPrivateKey
-    implements MLDSAPrivateKey
+    implements MLDSAPrivateKey, BCKey
 {
     private static final long serialVersionUID = 1L;
 

prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/mldsa/BCMLDSAPublicKey.java

@@ -5,6 +5,7 @@
 import java.io.ObjectOutputStream;
 
 import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
+import org.bouncycastle.jcajce.interfaces.BCKey;
 import org.bouncycastle.jcajce.interfaces.MLDSAPublicKey;
 import org.bouncycastle.jcajce.spec.MLDSAParameterSpec;
 import org.bouncycastle.pqc.crypto.mldsa.MLDSAPublicKeyParameters;
@@ -16,7 +17,7 @@
 import org.bouncycastle.util.encoders.Hex;
 
 public class BCMLDSAPublicKey
-    implements MLDSAPublicKey
+    implements MLDSAPublicKey, BCKey
 {
     private static final long serialVersionUID = 1L;
 

prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/mlkem/BCMLKEMPrivateKey.java

@@ -6,6 +6,7 @@
 
 import org.bouncycastle.asn1.ASN1Set;
 import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
+import org.bouncycastle.jcajce.interfaces.BCKey;
 import org.bouncycastle.jcajce.interfaces.MLKEMPrivateKey;
 import org.bouncycastle.jcajce.interfaces.MLKEMPublicKey;
 import org.bouncycastle.jcajce.spec.MLKEMParameterSpec;
@@ -19,7 +20,7 @@
 import org.bouncycastle.util.encoders.Hex;
 
 public class BCMLKEMPrivateKey
-    implements MLKEMPrivateKey
+    implements MLKEMPrivateKey, BCKey
 {
     private static final long serialVersionUID = 1L;
 

prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/mlkem/BCMLKEMPublicKey.java

@@ -5,6 +5,7 @@
 import java.io.ObjectOutputStream;
 
 import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
+import org.bouncycastle.jcajce.interfaces.BCKey;
 import org.bouncycastle.jcajce.interfaces.MLKEMPublicKey;
 import org.bouncycastle.jcajce.spec.MLKEMParameterSpec;
 import org.bouncycastle.pqc.crypto.mlkem.MLKEMPublicKeyParameters;
@@ -16,7 +17,7 @@
 import org.bouncycastle.util.encoders.Hex;
 
 public class BCMLKEMPublicKey
-    implements MLKEMPublicKey
+    implements MLKEMPublicKey, BCKey
 {
     private static final long serialVersionUID = 1L;
 

prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/slhdsa/BCSLHDSAPrivateKey.java

@@ -6,6 +6,7 @@
 
 import org.bouncycastle.asn1.ASN1Set;
 import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
+import org.bouncycastle.jcajce.interfaces.BCKey;
 import org.bouncycastle.jcajce.interfaces.SLHDSAPrivateKey;
 import org.bouncycastle.jcajce.interfaces.SLHDSAPublicKey;
 import org.bouncycastle.jcajce.spec.SLHDSAParameterSpec;
@@ -19,7 +20,7 @@
 import org.bouncycastle.util.encoders.Hex;
 
 public class BCSLHDSAPrivateKey
-    implements SLHDSAPrivateKey
+    implements SLHDSAPrivateKey, BCKey
 {
     private static final long serialVersionUID = 1L;
 

prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/slhdsa/BCSLHDSAPublicKey.java

@@ -5,6 +5,7 @@
 import java.io.ObjectOutputStream;
 
 import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
+import org.bouncycastle.jcajce.interfaces.BCKey;
 import org.bouncycastle.jcajce.interfaces.SLHDSAPublicKey;
 import org.bouncycastle.jcajce.spec.SLHDSAParameterSpec;
 import org.bouncycastle.pqc.crypto.slhdsa.SLHDSAPublicKeyParameters;
@@ -16,7 +17,7 @@
 import org.bouncycastle.util.encoders.Hex;
 
 public class BCSLHDSAPublicKey
-    implements SLHDSAPublicKey
+    implements SLHDSAPublicKey, BCKey
 {
     private static final long serialVersionUID = 1L;
 

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

@@ -726,7 +726,7 @@ public void compositeSignaturesTest(List<Map<String, Object>> testVectors)
             byte[] x5cpk = null;
             PublicKey pubKey = null, certPubKey = null;
             PrivateKey privKey = null;
-            CertificateFactory cf = CertificateFactory.getInstance("X.509");
+            CertificateFactory cf = CertificateFactory.getInstance("X.509", "BC");
             X509Certificate cert = null;
             try
             {