compatibility updates

ant/jdk13.xml

@@ -54,6 +54,7 @@
                 <exclude name="**/provider/config/PKCS12StoreParameter.java" />
             </fileset>
             <fileset dir="prov/src/main/java">
+                <exclude name="**/ec/ECUtils.java" />
                 <exclude name="**/ECPointUtil.java" />
                 <exclude name="**/ECNamedCurveSpec.java" />
                 <exclude name="**/LDAP*.java" />

ant/jdk14.xml

@@ -31,6 +31,7 @@
                 <exclude name="**/ValidateSignedMail.java"/>
             </fileset>
             <fileset dir="prov/src/main/java">
+                <exclude name="**/ec/ECUtils.java" />
                 <exclude name="**/ECPointUtil.java" />
                 <exclude name="**/ECNamedCurveSpec.java" />
                 <exclude name="**/BCEC*.java" />

jce/src/main/java/javax/crypto/EncryptedPrivateKeyInfo.java

@@ -146,7 +146,7 @@ public EncryptedPrivateKeyInfo(
      */
     public String getAlgName()
     {
-        return infoObj.getEncryptionAlgorithm().getObjectId().getId();
+        return infoObj.getEncryptionAlgorithm().getAlgorithm().getId();
     }
 
     private AlgorithmParameters getParameters()

prov/src/test/jdk1.3/org/bouncycastle/jce/provider/test/nist/AllTests.java

@@ -0,0 +1,46 @@
+package org.bouncycastle.jce.provider.test.nist;
+
+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;
+
+public class AllTests
+    extends TestCase
+{
+    public static void main (String[] args)
+    {
+        junit.textui.TestRunner.run(suite());
+    }
+
+    public static Test suite()
+    {
+        TestSuite suite = new TestSuite("CertPath Tests");
+
+        suite.addTestSuite(NistCertPathTest.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");
+        }
+    }
+}