Java 25 updates

Author: dghgit

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

@@ -2911,8 +2911,14 @@ public void checkCRLCompositeCreation()
         //
         // create the certificate - version 3
         //
-        CompositePublicKey compPub = new CompositePublicKey(IANAObjectIdentifiers.id_MLDSA65_ECDSA_P256_SHA512, mlDsaKp.getPublic(), ecPub);
-        CompositePrivateKey compPrivKey = new CompositePrivateKey(IANAObjectIdentifiers.id_MLDSA65_ECDSA_P256_SHA512, mlDsaKp.getPrivate(), ecPriv);
+        CompositePublicKey compPub = CompositePublicKey.builder(IANAObjectIdentifiers.id_MLDSA65_ECDSA_P256_SHA512)
+            .addPublicKey(mlDsaKp.getPublic(),  "BC")
+            .addPublicKey(ecPub)
+            .build();
+        CompositePrivateKey compPrivKey = CompositePrivateKey.builder(IANAObjectIdentifiers.id_MLDSA65_ECDSA_P256_SHA512)
+            .addPrivateKey(mlDsaKp.getPrivate(), "BC")
+            .addPrivateKey(ecPriv)
+            .build();
 
         ContentSigner sigGen = new JcaContentSignerBuilder("COMPOSITE").setProvider(BC).build(compPrivKey);
 
@@ -5578,7 +5584,7 @@ private void checkCompositeSignatureCertificateCreation()
 
             isEquals(subjectName, cert.getSubjectX500Principal().getName());
 
-            cert.verify(cert.getPublicKey());
+            cert.verify(cert.getPublicKey(), "BC");
             index++;
         }
     }
@@ -5841,12 +5847,6 @@ public static void main(
     {
         Security.addProvider(new BouncyCastleProvider());
 
-       // runTest(new CertTest());
-
-        X509CertificateHolder h = new X509CertificateHolder(Streams.readAll(new FileInputStream("/tmp/tmp/composite-cert.der")));
-
-        ContentVerifierProvider vp = new JcaContentVerifierProviderBuilder().setProvider("BC").build(h.getSubjectPublicKeyInfo());
-        assertTrue("Certificate signature must verify", h.isSignatureValid(vp));
-
+        runTest(new CertTest());
     }
 }

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;