added algorithm name to OID lookup

Author: dghgit

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

@@ -86,6 +86,11 @@ public static Builder builder(ASN1ObjectIdentifier compAlgOid)
         return new Builder(new AlgorithmIdentifier(compAlgOid));
     }
 
+    public static Builder builder(String algorithmName)
+    {
+        return builder(CompositeUtil.getOid(algorithmName));
+    }
+
     private final List<PrivateKey> keys;
     private final List<Provider> providers;
 

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

@@ -81,6 +81,11 @@ public static Builder builder(ASN1ObjectIdentifier compAlgOid)
         return new Builder(new AlgorithmIdentifier(compAlgOid));
     }
 
+    public static Builder builder(String algorithmName)
+    {
+        return builder(CompositeUtil.getOid(algorithmName));
+    }
+
     private final List<PublicKey> keys;
     private final List<Provider> providers;
 

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

@@ -0,0 +1,46 @@
+package org.bouncycastle.jcajce;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.bouncycastle.asn1.ASN1ObjectIdentifier;
+import org.bouncycastle.internal.asn1.iana.IANAObjectIdentifiers;
+import org.bouncycastle.util.Strings;
+
+class CompositeUtil
+{
+    private static final Map<String, ASN1ObjectIdentifier> algorithmOids = new HashMap<String, ASN1ObjectIdentifier>();
+    
+    static
+    {
+        algorithmOids.put("MLDSA44-RSA2048-PSS-SHA256", IANAObjectIdentifiers.id_MLDSA44_RSA2048_PSS_SHA256);
+        algorithmOids.put("MLDSA44-RSA2048-PKCS15-SHA256", IANAObjectIdentifiers.id_MLDSA44_RSA2048_PKCS15_SHA256);
+        algorithmOids.put("MLDSA44-Ed25519-SHA512", IANAObjectIdentifiers.id_MLDSA44_Ed25519_SHA512);
+        algorithmOids.put("MLDSA44-ECDSA-P256-SHA256", IANAObjectIdentifiers.id_MLDSA44_ECDSA_P256_SHA256);
+        algorithmOids.put("MLDSA65-RSA3072-PSS-SHA512", IANAObjectIdentifiers.id_MLDSA65_RSA3072_PSS_SHA512);
+        algorithmOids.put("MLDSA65-RSA3072-PKCS15-SHA512", IANAObjectIdentifiers.id_MLDSA65_RSA3072_PKCS15_SHA512);
+        algorithmOids.put("MLDSA65-RSA4096-PSS-SHA512", IANAObjectIdentifiers.id_MLDSA65_RSA4096_PSS_SHA512);
+        algorithmOids.put("MLDSA65-RSA4096-PKCS15-SHA512", IANAObjectIdentifiers.id_MLDSA65_RSA4096_PKCS15_SHA512);
+        algorithmOids.put("MLDSA65-ECDSA-P256-SHA512", IANAObjectIdentifiers.id_MLDSA65_ECDSA_P256_SHA512);
+        algorithmOids.put("MLDSA65-ECDSA-P384-SHA512", IANAObjectIdentifiers.id_MLDSA65_ECDSA_P384_SHA512);
+        algorithmOids.put("MLDSA65-ECDSA-brainpoolP256r1-SHA512", IANAObjectIdentifiers.id_MLDSA65_ECDSA_brainpoolP256r1_SHA512);
+        algorithmOids.put("MLDSA65-Ed25519-SHA512", IANAObjectIdentifiers.id_MLDSA65_Ed25519_SHA512);
+        algorithmOids.put("MLDSA87-ECDSA-P384-SHA512", IANAObjectIdentifiers.id_MLDSA87_ECDSA_P384_SHA512);
+        algorithmOids.put("MLDSA87-ECDSA-brainpoolP384r1-SHA512", IANAObjectIdentifiers.id_MLDSA87_ECDSA_brainpoolP384r1_SHA512);
+        algorithmOids.put("MLDSA87-Ed448-SHAKE256", IANAObjectIdentifiers.id_MLDSA87_Ed448_SHAKE256);
+        algorithmOids.put("MLDSA87-RSA4096-PSS-SHA512", IANAObjectIdentifiers.id_MLDSA87_RSA4096_PSS_SHA512);
+        algorithmOids.put("MLDSA87-ECDSA-P521-SHA512", IANAObjectIdentifiers.id_MLDSA87_ECDSA_P521_SHA512);
+        algorithmOids.put("MLDSA87-RSA3072-PSS-SHA512", IANAObjectIdentifiers.id_MLDSA87_RSA3072_PSS_SHA512);
+    }
+
+    static ASN1ObjectIdentifier getOid(String name)
+    {
+        ASN1ObjectIdentifier oid = algorithmOids.get(Strings.toUpperCase(name));
+        if (oid == null)
+        {
+            throw new IllegalArgumentException("name " + name + " not recognized");
+        }
+
+        return oid;
+    }
+}

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

@@ -183,6 +183,7 @@ private void sigInitVerify()
             this.componentSignatures[i].initVerify(compositePublicKey.getPublicKeys().get(i));
         }
         this.unprimed = true;
+        System.err.println("verified init");
     }
 
     protected void engineInitSign(PrivateKey privateKey)
@@ -467,8 +468,13 @@ else if (componentSignatures[0] instanceof org.bouncycastle.jcajce.provider.asym
             //signatures[0] is 32-byte random number
             if (!this.componentSignatures[i].verify(signatures[i]))
             {
+                System.err.println(i + " fails");
                 fail = true;
             }
+            else
+            {
+                System.err.println(i + " works");
+            }
         }
 
         return !fail;

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

@@ -9,13 +9,15 @@
 import java.security.SecureRandom;
 import java.security.SignatureException;
 
+import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
 import org.bouncycastle.crypto.CipherParameters;
 import org.bouncycastle.crypto.DataLengthException;
 import org.bouncycastle.jcajce.MLDSAProxyPrivateKey;
 import org.bouncycastle.jcajce.interfaces.MLDSAPublicKey;
 import org.bouncycastle.jcajce.provider.asymmetric.util.BaseDeterministicOrRandomSignature;
 import org.bouncycastle.jcajce.spec.MLDSAParameterSpec;
 import org.bouncycastle.pqc.crypto.mldsa.MLDSAParameters;
+import org.bouncycastle.pqc.crypto.mldsa.MLDSAPublicKeyParameters;
 import org.bouncycastle.pqc.crypto.mldsa.MLDSASigner;
 import org.bouncycastle.pqc.crypto.util.PublicKeyFactory;
 
@@ -49,19 +51,28 @@ protected void verifyInit(PublicKey publicKey)
             BCMLDSAPublicKey key = (BCMLDSAPublicKey)publicKey;
 
             this.keyParams = key.getKeyParams();
-
-            if (parameters != null)
+        }
+        else
+        {
+            try
             {
-                String canonicalAlg = MLDSAParameterSpec.fromName(parameters.getName()).getName();
-                if (!canonicalAlg.equals(key.getAlgorithm()))
-                {
-                    throw new InvalidKeyException("signature configured for " + canonicalAlg);
-                }
+                SubjectPublicKeyInfo pubKeyInfo = SubjectPublicKeyInfo.getInstance(publicKey.getEncoded());
+                this.keyParams = org.bouncycastle.pqc.crypto.util.PublicKeyFactory.createKey(pubKeyInfo);
+                publicKey = new BCMLDSAPublicKey((MLDSAPublicKeyParameters)this.keyParams);
+            }
+            catch (Exception e)
+            {
+                throw new InvalidKeyException("unknown public key passed to ML-DSA");
             }
         }
-        else
+
+        if (parameters != null)
         {
-            throw new InvalidKeyException("unknown public key passed to ML-DSA");
+            String canonicalAlg = MLDSAParameterSpec.fromName(parameters.getName()).getName();
+            if (!canonicalAlg.equals(publicKey.getAlgorithm()))
+            {
+                throw new InvalidKeyException("signature configured for " + canonicalAlg);
+            }
         }
     }