minor clean up.

added backport of BaseBlockCipher for 1.5
migrated PBETest from 1.4 to 1.5.
migrated PfxPduTest to 1.5.

Author: dghgit

ant/jdk14.xml

@@ -153,6 +153,7 @@
 		<exclude name="**/MailGeneralTest.java"/>
 		<exclude name="**/SignedMailValidatorTest.java"/>
 		<exclude name="**/DummyCertPathReviewer.java"/>
+                <exclude name="**/NewSMIMEAuthEnvelopedTest.java"/>
 	    </fileset>
             <fileset dir="prov/src/test/java">
                 <exclude name="**/AEADTest.java"/>

ant/jdk15+.xml

@@ -73,6 +73,8 @@
 
         </copy>
         <copy todir="${src.dir}" overwrite="true">
+            <fileset dir="prov/src/main/jdk1.5" includes="**/*.java" />
+            <fileset dir="prov/src/test/jdk1.5" includes="**/*.java" />
             <fileset dir="pkix/src/main/jdk1.5" includes="**/*.java" />
             <fileset dir="tls/src/main/jdk1.5" includes="**/*.java" />
             <fileset dir="tls/src/test/jdk1.5" includes="**/*.java" />

pkix/src/test/java/org/bouncycastle/pkcs/test/PfxPduTest.java

@@ -69,9 +69,9 @@
 import org.bouncycastle.pkcs.PKCSException;
 import org.bouncycastle.pkcs.bc.BcPKCS12MacCalculatorBuilder;
 import org.bouncycastle.pkcs.bc.BcPKCS12MacCalculatorBuilderProvider;
-import org.bouncycastle.pkcs.bc.BcPKCS12PBMac1CalculatorBuilderProvider;
 import org.bouncycastle.pkcs.bc.BcPKCS12PBEInputDecryptorProviderBuilder;
 import org.bouncycastle.pkcs.bc.BcPKCS12PBEOutputEncryptorBuilder;
+import org.bouncycastle.pkcs.bc.BcPKCS12PBMac1CalculatorBuilderProvider;
 import org.bouncycastle.pkcs.jcajce.JcaPKCS12SafeBagBuilder;
 import org.bouncycastle.pkcs.jcajce.JcaPKCS8EncryptedPrivateKeyInfoBuilder;
 import org.bouncycastle.pkcs.jcajce.JcePKCS12MacCalculatorBuilder;
@@ -80,6 +80,7 @@
 import org.bouncycastle.pkcs.jcajce.JcePKCSPBEOutputEncryptorBuilder;
 import org.bouncycastle.util.Arrays;
 import org.bouncycastle.util.encoders.Base64;
+import org.junit.function.ThrowingRunnable;
 
 import static org.junit.Assert.assertThrows;
 
@@ -1138,7 +1139,7 @@ public void testPfxPduMac()
     public void testPfxPduPBMac1PBKdf2()
         throws Exception
     {
-        char[] password = "1234".toCharArray();
+        final char[] password = "1234".toCharArray();
         // valid test vectors
         for (byte[] test_vector : new byte[][]{pkcs12WithPBMac1PBKdf2_a1, pkcs12WithPBMac1PBKdf2_a2, pkcs12WithPBMac1PBKdf2_a3})
         {
@@ -1160,9 +1161,17 @@ public void testPfxPduPBMac1PBKdf2()
         }
 
         // invalid test vector that throws exception
-        PKCS12PfxPdu pfx = new PKCS12PfxPdu(pkcs12WithPBMac1PBKdf2_a6);
+        final PKCS12PfxPdu pfx = new PKCS12PfxPdu(pkcs12WithPBMac1PBKdf2_a6);
         assertTrue(pfx.hasMac());
-        PKCSException thrown = assertThrows(PKCSException.class, () -> pfx.isMacValid(new BcPKCS12PBMac1CalculatorBuilderProvider(), password));
+        PKCSException thrown = assertThrows(PKCSException.class, new ThrowingRunnable()
+        {
+            @Override
+            public void run()
+                throws Throwable
+            {
+                pfx.isMacValid(new BcPKCS12PBMac1CalculatorBuilderProvider(), password);
+            }
+        });
         assertTrue(thrown.getMessage().contains("Key length must be present when using PBMAC1."));
     }