added test for use of context by reflection

Author: dghgit

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

@@ -38,6 +38,7 @@
 import org.bouncycastle.jcajce.spec.ContextParameterSpec;
 import org.bouncycastle.jcajce.util.BCJcaJceHelper;
 import org.bouncycastle.jcajce.util.JcaJceHelper;
+import org.bouncycastle.jcajce.util.SpecUtil;
 import org.bouncycastle.util.Arrays;
 import org.bouncycastle.util.Exceptions;
 import org.bouncycastle.util.Strings;
@@ -513,10 +514,48 @@ else if (algorithmParameterSpec instanceof CompositeSignatureSpec)
             {
                 this.preHashDigest = this.baseDigest;
             }
-            this.contextSpec = (ContextParameterSpec)compositeSignatureSpec.getSecondarySpec();
+            AlgorithmParameterSpec secondarySpec = compositeSignatureSpec.getSecondarySpec();
+
+            if (secondarySpec == null || secondarySpec instanceof ContextParameterSpec)
+            {
+                this.contextSpec = (ContextParameterSpec)compositeSignatureSpec.getSecondarySpec();
+            }
+            else
+            {
+                byte[] context = SpecUtil.getContextFrom(secondarySpec);
+                if (context != null)
+                {
+                    contextSpec = new ContextParameterSpec(context);
+                }
+                else
+                {
+                    throw new InvalidAlgorithmParameterException("unknown parameterSpec passed to composite signature");
+                }
+            }
         }
         else
         {
+            byte[] context = SpecUtil.getContextFrom(algorithmParameterSpec);
+            if (context != null)
+            {
+                contextSpec = new ContextParameterSpec(context);
+                try
+                {
+                    if (compositeKey instanceof PublicKey)
+                    {
+                        sigInitVerify();
+                    }
+                    else
+                    {
+                        sigInitSign();
+                    }
+                }
+                catch (InvalidKeyException e)
+                {
+                    throw new InvalidAlgorithmParameterException("keys invalid on reset: " + e.getMessage(), e);
+                }
+            }
+
             throw new InvalidAlgorithmParameterException("unknown parameterSpec passed to composite signature");
         }
     }

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

@@ -18,6 +18,7 @@
 import java.security.cert.X509Certificate;
 import java.security.interfaces.RSAPrivateKey;
 import java.security.interfaces.RSAPublicKey;
+import java.security.spec.AlgorithmParameterSpec;
 import java.security.spec.ECGenParameterSpec;
 import java.security.spec.PKCS8EncodedKeySpec;
 import java.security.spec.X509EncodedKeySpec;
@@ -623,6 +624,12 @@ private void doTestPrehash(String sigName, String digestName, ContextParameterSp
         signature.update(MessageDigest.getInstance(digestName, "BC").digest(msg));
         assertTrue(signature.verify(signatureValue));
 
+        // check reflection case
+        signature.initVerify(keyPair.getPublic());
+        signature.setParameter(new CompositeSignatureSpec(true, new MyContextSpec(contextSpec.getContext())));
+        signature.update(MessageDigest.getInstance(digestName, "BC").digest(msg));
+        assertTrue(signature.verify(signatureValue));
+
         // full msg sign, verify hash
         signature = Signature.getInstance(sigName, "BC");
         signature.initSign(keyPair.getPrivate());
@@ -876,6 +883,22 @@ private static String extractString(String json, String key)
         return json.substring(start, end).replace("\\\"", "\"");
     }
 
+    public static class MyContextSpec
+        implements AlgorithmParameterSpec
+    {
+        private final byte[] context;
+
+        MyContextSpec(byte[] context)
+        {
+            this.context = context;
+        }
+
+        public byte[] getContext()
+        {
+            return context;
+        }
+    }
+
     private static class ProxyHSMPrivateKey
         implements MLDSAPrivateKey
     {