relates to github #2186: moved ML-DSA, SLH-DSA to use SignatureSpi.

adjusted composite to deal with the same.
Java 4 compatibility fixes.

Author: dghgit

core/src/main/jdk1.4/org/bouncycastle/util/Arrays.java

@@ -177,6 +177,37 @@ public static boolean constantTimeAreEqual(
         return nonEqual == 0;
     }
 
+    public static boolean constantTimeAreEqual(int len, long[] a, int aOff, long[] b, int bOff)
+    {
+        if (null == a)
+        {
+            throw new NullPointerException("'a' cannot be null");
+        }
+        if (null == b)
+        {
+            throw new NullPointerException("'b' cannot be null");
+        }
+        if (len < 0)
+        {
+            throw new IllegalArgumentException("'len' cannot be negative");
+        }
+        if (aOff > (a.length - len))
+        {
+            throw new IndexOutOfBoundsException("'aOff' value invalid for specified length");
+        }
+        if (bOff > (b.length - len))
+        {
+            throw new IndexOutOfBoundsException("'bOff' value invalid for specified length");
+        }
+
+        long d = 0;
+        for (int i = 0; i < len; ++i)
+        {
+            d |= (a[aOff + i] ^ b[bOff + i]);
+        }
+        return 0L == d;
+    }
+
     public static int compareUnsigned(byte[] a, byte[] b)
     {
         if (a == b)

core/src/test/java/org/bouncycastle/pqc/crypto/test/MLDSATest.java

@@ -79,7 +79,7 @@ public void testConsistency()
                 {
                     AsymmetricCipherKeyPair kp = kpg.generateKeyPair();
 
-                    Signer signer = parameters.isPreHash() ? new HashMLDSASigner() : new MLDSASigner();
+                    Signer signer = parameters.isPreHash() ? (Signer)new HashMLDSASigner() : (Signer)new MLDSASigner();
 
                     for (int j = 0; j < 2; ++j)
                     {

prov/src/main/java/org/bouncycastle/jcajce/CompositeUtil.java

@@ -35,7 +35,7 @@ class CompositeUtil
 
     static ASN1ObjectIdentifier getOid(String name)
     {
-        ASN1ObjectIdentifier oid = algorithmOids.get(Strings.toUpperCase(name));
+        ASN1ObjectIdentifier oid = (ASN1ObjectIdentifier)algorithmOids.get(Strings.toUpperCase(name));
         if (oid == null)
         {
             throw new IllegalArgumentException("name " + name + " not recognized");

prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/compositesignatures/SignatureSpi.java

@@ -439,15 +439,15 @@ protected boolean engineVerify(byte[] signature)
         throws SignatureException
     {
         int mldsaSigLen = 0;
-        if (componentSignatures[0] instanceof org.bouncycastle.jcajce.provider.asymmetric.mldsa.SignatureSpi.MLDSA44)
+        if (algs[0].indexOf("44") > 0)
         {
             mldsaSigLen = 2420;
         }
-        else if (componentSignatures[0] instanceof org.bouncycastle.jcajce.provider.asymmetric.mldsa.SignatureSpi.MLDSA65)
+        else if (algs[0].indexOf("65") > 0)
         {
             mldsaSigLen = 3309;
         }
-        else if (componentSignatures[0] instanceof org.bouncycastle.jcajce.provider.asymmetric.mldsa.SignatureSpi.MLDSA87)
+        else if (algs[0].indexOf("87") > 0)
         {
             mldsaSigLen = 4627;
         }

prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/util/BaseDeterministicOrRandomSignature.java

@@ -7,8 +7,8 @@
 import java.security.ProviderException;
 import java.security.PublicKey;
 import java.security.SecureRandom;
-import java.security.Signature;
 import java.security.SignatureException;
+import java.security.SignatureSpi;
 import java.security.spec.AlgorithmParameterSpec;
 
 import org.bouncycastle.crypto.CipherParameters;
@@ -22,7 +22,7 @@
 import org.bouncycastle.util.Exceptions;
 
 public abstract class BaseDeterministicOrRandomSignature
-    extends Signature
+    extends SignatureSpi
 {
     private final JcaJceHelper helper = new BCJcaJceHelper();
     private final AlgorithmParameterSpec originalSpec;
@@ -35,7 +35,6 @@ public abstract class BaseDeterministicOrRandomSignature
 
     protected BaseDeterministicOrRandomSignature(String name)
     {
-        super(name);
         this.originalSpec = ContextParameterSpec.EMPTY_CONTEXT_SPEC;
     }