Merge branch 'main' of gitlab.cryptoworkshop.com:root/bc-java

Author: mwcw

pg/src/test/jdk1.4/org/bouncycastle/openpgp/test/AllTests.java

@@ -0,0 +1,67 @@
+package org.bouncycastle.openpgp.test;
+
+import java.security.Security;
+
+import junit.extensions.TestSetup;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.bouncycastle.test.PrintTestResult;
+import org.bouncycastle.util.test.SimpleTestResult;
+
+public class AllTests
+    extends TestCase
+{
+    public void testPGP()
+    {
+        Security.addProvider(new BouncyCastleProvider());
+
+        org.bouncycastle.util.test.Test[] tests = RegressionTest.tests;
+
+        for (int i = 0; i != tests.length; i++)
+        {
+            SimpleTestResult result = (SimpleTestResult)tests[i].perform();
+
+            if (!result.isSuccessful())
+            {
+                fail(tests[i].getClass().getName() + " " + result.toString());
+            }
+        }
+    }
+
+    public static void main(String[] args)
+    {
+        PrintTestResult.printResult(junit.textui.TestRunner.run(suite()));
+    }
+
+    public static Test suite()
+    {
+        TestSuite suite = new TestSuite("OpenPGP Tests");
+
+        suite.addTestSuite(AllTests.class);
+        suite.addTestSuite(DSA2Test.class);
+        suite.addTestSuite(PGPUnicodeTest.class);
+
+        return new BCTestSetup(suite);
+    }
+
+    static class BCTestSetup
+        extends TestSetup
+    {
+        public BCTestSetup(Test test)
+        {
+            super(test);
+        }
+
+        protected void setUp()
+        {
+            Security.addProvider(new BouncyCastleProvider());
+        }
+
+        protected void tearDown()
+        {
+            Security.removeProvider("BC");
+        }
+    }
+}

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

@@ -18,6 +18,7 @@
 import org.bouncycastle.jcajce.spec.ContextParameterSpec;
 import org.bouncycastle.jcajce.util.BCJcaJceHelper;
 import org.bouncycastle.jcajce.util.JcaJceHelper;
+import org.bouncycastle.util.Exceptions;
 
 public abstract class BaseDeterministicOrRandomSignature
     extends Signature
@@ -34,14 +35,14 @@ public abstract class BaseDeterministicOrRandomSignature
     protected BaseDeterministicOrRandomSignature(String name)
     {
         super(name);
-        this.originalSpec = null;
+        this.originalSpec = ContextParameterSpec.EMPTY_CONTEXT_SPEC;
     }
 
     final protected void engineInitVerify(PublicKey publicKey)
         throws InvalidKeyException
     {
         verifyInit(publicKey);
-        paramSpec = null;
+        paramSpec = ContextParameterSpec.EMPTY_CONTEXT_SPEC;
         isInitState = true;
         reInit();
     }
@@ -53,7 +54,7 @@ final protected void engineInitSign(
         throws InvalidKeyException
     {
         signInit(privateKey, null);
-        paramSpec = null;
+        paramSpec = ContextParameterSpec.EMPTY_CONTEXT_SPEC;
         isInitState = true;
         reInit();
     }
@@ -64,7 +65,7 @@ final protected void engineInitSign(
         throws InvalidKeyException
     {
         signInit(privateKey, random);
-        paramSpec = null;
+        paramSpec = ContextParameterSpec.EMPTY_CONTEXT_SPEC;
         isInitState = true;
         reInit();
     }
@@ -170,7 +171,7 @@ protected final AlgorithmParameters engineGetParameters()
                 }
                 catch (Exception e)
                 {
-                    throw new IllegalStateException(e.toString(), e);
+                    throw Exceptions.illegalStateException(e.toString(), e);
                 }
             }
         }

prov/src/main/java/org/bouncycastle/jcajce/spec/ContextParameterSpec.java

@@ -7,6 +7,8 @@
 public class ContextParameterSpec
     implements AlgorithmParameterSpec
 {
+    public static ContextParameterSpec EMPTY_CONTEXT_SPEC = new ContextParameterSpec(new byte[0]);
+
     private final byte[] context;
 
     public ContextParameterSpec(byte[] context)

prov/src/main/jdk1.4/org/bouncycastle/jce/provider/BouncyCastleProvider.java

@@ -96,7 +96,7 @@ public final class BouncyCastleProvider extends Provider
 
     private static final String[] ASYMMETRIC_CIPHERS =
     {
-        "DSA", "DH", "EC", "RSA", "GOST", "ECGOST", "ElGamal", "DSTU4145", "GM", "EdEC", "SPHINCSPlus", "Dilithium", "Falcon", "NTRU", "SLHDSA", "MLDSA", "MLKEM"
+        "DSA", "DH", "EC", "RSA", "GOST", "ECGOST", "ElGamal", "DSTU4145", "GM", "EdEC", "SPHINCSPlus", "Dilithium", "Falcon", "NTRU", "CONTEXT", "SLHDSA", "MLDSA", "MLKEM"
     };
 
     /*