Merge branch 'master' of git.bouncycastle.org:bc-java

6 files changed, 156 insertions, 148 deletions

diff --git a/ant/jdk13.xml b/ant/jdk13.xml
index 1839c548..d02f92fe 100644
--- a/ant/jdk13.xml
+++ b/ant/jdk13.xml
@@ -163,6 +163,7 @@
                 <exclude name="**/SignedMailValidatorTest.java" />
                 <exclude name="**/DummyCertPathReviewer.java" />
             </fileset>
+            <fileset dir="mail/src/test/resources" />
             <fileset dir="prov/src/main/resources" includes="**/*.properties" />
             <fileset dir="core/src/test/javadoc" includes="**/*.html" />
             <fileset dir="core/src/test/resources" includes="**/*.properties" />
diff --git a/ant/jdk15+.xml b/ant/jdk15+.xml
index 0bf59d0c..5047eaa7 100644
--- a/ant/jdk15+.xml
+++ b/ant/jdk15+.xml
@@ -53,6 +53,7 @@
             <fileset dir="mail/src/main/javadoc" includes="**/*.html" />
             <fileset dir="mail/src/main/resources" includes="**/*.properties" />
             <fileset dir="mail/src/test/java" includes="**/*.java" />
+            <fileset dir="mail/src/test/resources" includes="**/*.*" />
 
             <fileset dir="core/src/test/data" includes="**/*.message" />
             <fileset dir="core/src/test/data" includes="**/*.eml" />
diff --git a/build1-1 b/build1-1
index 017daf36..43487a8f 100644
--- a/build1-1
+++ b/build1-1
@@ -15,35 +15,38 @@ WINDOWTITLE="Bouncy Castle Cryptography $version API Specification"
 HEADER="<b>Bouncy Castle Cryptography $version</b>"
 DOCTITLE="Bouncy Castle $version API Specification"
 
-if test "$base" != ""  -a ! -d lcrypto-jdk11-$base
+artifacts=build/artifacts/jdk1.1
+mkdir -p $artifacts
+
+if test "$base" != ""  -a ! -d $artifacts/lcrypto-jdk11-$base
 then
     echo "making lightweight release"
 
-    mkdir lcrypto-jdk11-$base
-    mkdir lcrypto-jdk11-$base/src
-    tar cf - index.html LICENSE.html CONTRIBUTORS.html docs | (cd lcrypto-jdk11-$base && tar xf -)
+    mkdir $artifacts/lcrypto-jdk11-$base
+    mkdir $artifacts/lcrypto-jdk11-$base/src
+    tar cf - index.html LICENSE.html CONTRIBUTORS.html docs | (cd $artifacts/lcrypto-jdk11-$base && tar xf -)
     (cd core/src/main/java && tar cf - org/bouncycastle/LICENSE.java \
     org/bouncycastle/math org/bouncycastle/crypto org/bouncycastle/util org/bouncycastle/asn1 org/bouncycastle/pqc/math org/bouncycastle/pqc/crypto org/bouncycastle/pqc/asn1 ) \
-     | (cd lcrypto-jdk11-$base/src && tar xf -)
+     | (cd $artifacts/lcrypto-jdk11-$base/src && tar xf -)
     (cd core/src/main/javadoc && tar cf -  \
     org/bouncycastle/math org/bouncycastle/crypto org/bouncycastle/util org/bouncycastle/asn1 ) \
-     | (cd lcrypto-jdk11-$base/src && tar xf -)
+     | (cd $artifacts/lcrypto-jdk11-$base/src && tar xf -)
     (cd core/src/main/jdk1.4 && tar cf - org/bouncycastle/util) \
-     | (cd lcrypto-jdk11-$base/src && tar xf -)
+     | (cd $artifacts/lcrypto-jdk11-$base/src && tar xf -)
     (cd core/src/main/jdk1.3 && tar cf - org/bouncycastle/asn1) \
-     | (cd lcrypto-jdk11-$base/src && tar xf -)
+     | (cd $artifacts/lcrypto-jdk11-$base/src && tar xf -)
     (cd core/src/main/jdk1.1 && tar cf - *) \
-     | (cd lcrypto-jdk11-$base/src && tar xf -)
+     | (cd $artifacts/lcrypto-jdk11-$base/src && tar xf -)
     (cd core/src/test/java && tar cf - org/bouncycastle/crypto org/bouncycastle/util org/bouncycastle/asn1) \
-     | (cd lcrypto-jdk11-$base/src && tar xf -)
+     | (cd $artifacts/lcrypto-jdk11-$base/src && tar xf -)
     (cd core/src/test/jdk1.3 && tar cf - org) \
-     | (cd lcrypto-jdk11-$base/src && tar xf -)
+     | (cd $artifacts/lcrypto-jdk11-$base/src && tar xf -)
     (cd core/src/test/jdk1.2 && tar cf - org) \
-     | (cd lcrypto-jdk11-$base/src && tar xf -)
+     | (cd $artifacts/lcrypto-jdk11-$base/src && tar xf -)
     (cd core/src/test/jdk1.1 && tar cf - org) \
-     | (cd lcrypto-jdk11-$base/src && tar xf -)
+     | (cd $artifacts/lcrypto-jdk11-$base/src && tar xf -)
     (
-        cd lcrypto-jdk11-$base;
+        cd $artifacts/lcrypto-jdk11-$base;
 
         mkdir classes; mkdir javadoc;
 
@@ -150,49 +153,49 @@ javac -d ../../../classes -classpath ../../../classes:../../../src:$JDK11PATH/li
 javac -d ../../../classes -classpath ../../../classes:../../../src:$JDK11PATH/lib/classes.zip u*/t*/*.java 
 javac -d ../../../classes -classpath ../../../classes:../../../src:$JDK11PATH/lib/classes.zip */u*/*.java )
 
-        cp ../core/src/test/resources/org/bouncycastle/crypto/test/*.txt classes/org/bouncycastle/crypto/test/
+        cp ../../../../core/src/test/resources/org/bouncycastle/crypto/test/*.txt classes/org/bouncycastle/crypto/test/
 
         echo "lightweight regression test"
         java -mx512m -classpath classes:$JDK11PATH/lib/classes.zip -Dbc.test.data.home=/home/dgh/bc/java/crypto/test/data org.bouncycastle.crypto.test.RegressionTest
         java -classpath classes:$JDK11PATH/lib/classes.zip -Dbc.test.data.home=/home/dgh/bc/java/crypto/test/data org.bouncycastle.asn1.test.RegressionTest
     )
-    (2>&1 find lcrypto-jdk11-$base -name CVS -exec rm -rf \{\} \; ) > /dev/null
+    (2>&1 find $artifacts/lcrypto-jdk11-$base -name CVS -exec rm -rf \{\} \; ) > /dev/null
 fi
 
-if  test "$base" != "" -a ! -d jce-jdk11-$base
+if  test "$base" != "" -a ! -d $artifacts/jce-jdk11-$base
 then
     echo "making JCE release"
 
-    mkdir jce-jdk11-$base
-    mkdir jce-jdk11-$base/src
-    tar cf - index.html LICENSE.html CONTRIBUTORS.html docs | (cd jce-jdk11-$base; tar xf -)
-    ((cd jce/src/main/java && tar cf - *) | (cd jce-jdk11-$base/src && tar xf -))
-    ((cd core/src/main/java && tar cf - * ) | (cd jce-jdk11-$base/src && tar xf -))
-    ((cd core/src/main/jdk1.4 && tar cf - * ) | (cd jce-jdk11-$base/src && tar xf -))
-    ((cd core/src/main/jdk1.3 && tar cf - * ) | (cd jce-jdk11-$base/src && tar xf -))
-    ((cd core/src/main/jdk1.2 && tar cf - * ) | (cd jce-jdk11-$base/src && tar xf -))
-    ((cd core/src/main/jdk1.1 && tar cf - * ) | (cd jce-jdk11-$base/src && tar xf -))
-    ((cd core/src/test/java && tar cf - * ) | (cd jce-jdk11-$base/src && tar xf -))
-    ((cd core/src/test/jdk1.4 && tar cf - * ) | (cd jce-jdk11-$base/src && tar xf -))
-    ((cd core/src/test/jdk1.3 && tar cf - * ) | (cd jce-jdk11-$base/src && tar xf -))
-    ((cd core/src/test/jdk1.2 && tar cf - * ) | (cd jce-jdk11-$base/src && tar xf -))
-    ((cd core/src/test/jdk1.1 && tar cf - * ) | (cd jce-jdk11-$base/src && tar xf -))
-    ((cd core/src/main/javadoc && tar cf - * ) | (cd jce-jdk11-$base/src && tar xf -))
-    ((cd prov/src/main/java && tar cf - * ) | (cd jce-jdk11-$base/src && tar xf -))
-    ((cd prov/src/main/javadoc && tar cf - * ) | (cd jce-jdk11-$base/src && tar xf -))
-    ((cd prov/src/test/java && tar cf - * ) | (cd jce-jdk11-$base/src && tar xf -))
-    ((cd prov/src/main/jdk1.4 && tar cf - * ) | (cd jce-jdk11-$base/src && tar xf -))
-    ((cd prov/src/test/jdk1.4 && tar cf - * ) | (cd jce-jdk11-$base/src && tar xf -))
-    ((cd prov/src/main/jdk1.3 && tar cf - * ) | (cd jce-jdk11-$base/src && tar xf -))
-    ((cd prov/src/test/jdk1.3 && tar cf - * ) | (cd jce-jdk11-$base/src && tar xf -))
-    ((cd prov/src/main/jdk1.2 && tar cf - * ) | (cd jce-jdk11-$base/src && tar xf -))
-    ((cd prov/src/main/jdk1.1 && tar cf - * ) | (cd jce-jdk11-$base/src && tar xf -))
-    ((cd prov/src/test/jdk1.1 && tar cf - * ) | (cd jce-jdk11-$base/src && tar xf -))
-    ((cd prov/src/main/java && tar cf - org/bouncycastle/jce/exception ) | (cd jce-jdk11-$base/src && tar xf -))
+    mkdir $artifacts/jce-jdk11-$base
+    mkdir $artifacts/jce-jdk11-$base/src
+    tar cf - index.html LICENSE.html CONTRIBUTORS.html docs | (cd $artifacts/jce-jdk11-$base; tar xf -)
+    ((cd jce/src/main/java && tar cf - *) | (cd $artifacts/jce-jdk11-$base/src && tar xf -))
+    ((cd core/src/main/java && tar cf - * ) | (cd $artifacts/jce-jdk11-$base/src && tar xf -))
+    ((cd core/src/main/jdk1.4 && tar cf - * ) | (cd $artifacts/jce-jdk11-$base/src && tar xf -))
+    ((cd core/src/main/jdk1.3 && tar cf - * ) | (cd $artifacts/jce-jdk11-$base/src && tar xf -))
+    ((cd core/src/main/jdk1.2 && tar cf - * ) | (cd $artifacts/jce-jdk11-$base/src && tar xf -))
+    ((cd core/src/main/jdk1.1 && tar cf - * ) | (cd $artifacts/jce-jdk11-$base/src && tar xf -))
+    ((cd core/src/test/java && tar cf - * ) | (cd $artifacts/jce-jdk11-$base/src && tar xf -))
+    ((cd core/src/test/jdk1.4 && tar cf - * ) | (cd $artifacts/jce-jdk11-$base/src && tar xf -))
+    ((cd core/src/test/jdk1.3 && tar cf - * ) | (cd $artifacts/jce-jdk11-$base/src && tar xf -))
+    ((cd core/src/test/jdk1.2 && tar cf - * ) | (cd $artifacts/jce-jdk11-$base/src && tar xf -))
+    ((cd core/src/test/jdk1.1 && tar cf - * ) | (cd $artifacts/jce-jdk11-$base/src && tar xf -))
+    ((cd core/src/main/javadoc && tar cf - * ) | (cd $artifacts/jce-jdk11-$base/src && tar xf -))
+    ((cd prov/src/main/java && tar cf - * ) | (cd $artifacts/jce-jdk11-$base/src && tar xf -))
+    ((cd prov/src/main/javadoc && tar cf - * ) | (cd $artifacts/jce-jdk11-$base/src && tar xf -))
+    ((cd prov/src/test/java && tar cf - * ) | (cd $artifacts/jce-jdk11-$base/src && tar xf -))
+    ((cd prov/src/main/jdk1.4 && tar cf - * ) | (cd $artifacts/jce-jdk11-$base/src && tar xf -))
+    ((cd prov/src/test/jdk1.4 && tar cf - * ) | (cd $artifacts/jce-jdk11-$base/src && tar xf -))
+    ((cd prov/src/main/jdk1.3 && tar cf - * ) | (cd $artifacts/jce-jdk11-$base/src && tar xf -))
+    ((cd prov/src/test/jdk1.3 && tar cf - * ) | (cd $artifacts/jce-jdk11-$base/src && tar xf -))
+    ((cd prov/src/main/jdk1.2 && tar cf - * ) | (cd $artifacts/jce-jdk11-$base/src && tar xf -))
+    ((cd prov/src/main/jdk1.1 && tar cf - * ) | (cd $artifacts/jce-jdk11-$base/src && tar xf -))
+    ((cd prov/src/test/jdk1.1 && tar cf - * ) | (cd $artifacts/jce-jdk11-$base/src && tar xf -))
+    ((cd prov/src/main/java && tar cf - org/bouncycastle/jce/exception ) | (cd $artifacts/jce-jdk11-$base/src && tar xf -))
 
 
     (
-    cd jce-jdk11-$base; mkdir classes; mkdir javadoc;
+    cd $artifacts/jce-jdk11-$base; mkdir classes; mkdir javadoc;
 
     rm -rf src/org/bouncycastle/crypto/test/ntru
     rm -rf src/org/bouncycastle/pqc/math/ntru
@@ -413,27 +416,27 @@ then
     java -classpath classes:$JDK11PATH/lib/classes.zip org.bouncycastle.jce.provider.test.RegressionTest
     )
 
-    ( 2>&1 find jce-jdk11-$base -name CVS -exec rm -rf \{\} \;) > /dev/null
+    ( 2>&1 find $artifacts/jce-jdk11-$base -name CVS -exec rm -rf \{\} \;) > /dev/null
 fi
 
-if test "$base" != "" -a ! -d bcpkix-jdk11-$base
+if test "$base" != "" -a ! -d $artifacts/bcpkix-jdk11-$base
 then
     echo "making PKIX release"
 
-    mkdir bcpkix-jdk11-$base
-    mkdir bcpkix-jdk11-$base/src
-    tar cf - index.html LICENSE.html CONTRIBUTORS.html docs | (cd bcpkix-jdk11-$base; tar xf -)
-    ((cd pkix/src/main/java && tar cf - * ) | (cd bcpkix-jdk11-$base/src && tar xf -))
-    ((cd pkix/src/main/jdk1.4 && tar cf - org/bouncycastle/cms org/bouncycastle/eac ) | (cd bcpkix-jdk11-$base/src && tar xf -))
-    ((cd pkix/src/main/jdk1.3 && tar cf - org/bouncycastle/cert org/bouncycastle/pkcs org/bouncycastle/cms org/bouncycastle/eac org/bouncycastle/tsp org/bouncycastle/operator ) | (cd bcpkix-jdk11-$base/src && tar xf -))
-    ((cd pkix/src/main/jdk1.2 && tar cf - org/bouncycastle/cert org/bouncycastle/cms ) | (cd bcpkix-jdk11-$base/src && tar xf -))
-    ((cd pkix/src/main/jdk1.1 && tar cf - * ) | (cd bcpkix-jdk11-$base/src && tar xf -))
-    ((cd pkix/src/test/java && tar cf - * ) | (cd bcpkix-jdk11-$base/src && tar xf -))
-    ((cd pkix/src/test/jdk1.3 && tar cf - org/bouncycastle/cert ) | (cd bcpkix-jdk11-$base/src && tar xf -))
-    ((cd pkix/src/test/jdk1.1 && tar cf - org/bouncycastle/cert ) | (cd bcpkix-jdk11-$base/src && tar xf -))
-    ((cd pkix/src/main/javadoc && tar cf - * ) | (cd bcpkix-jdk11-$base/src && tar xf -))
+    mkdir $artifacts/bcpkix-jdk11-$base
+    mkdir $artifacts/bcpkix-jdk11-$base/src
+    tar cf - index.html LICENSE.html CONTRIBUTORS.html docs | (cd $artifacts/bcpkix-jdk11-$base; tar xf -)
+    ((cd pkix/src/main/java && tar cf - * ) | (cd $artifacts/bcpkix-jdk11-$base/src && tar xf -))
+    ((cd pkix/src/main/jdk1.4 && tar cf - org/bouncycastle/cms org/bouncycastle/eac ) | (cd $artifacts/bcpkix-jdk11-$base/src && tar xf -))
+    ((cd pkix/src/main/jdk1.3 && tar cf - org/bouncycastle/cert org/bouncycastle/pkcs org/bouncycastle/cms org/bouncycastle/eac org/bouncycastle/tsp org/bouncycastle/operator ) | (cd $artifacts/bcpkix-jdk11-$base/src && tar xf -))
+    ((cd pkix/src/main/jdk1.2 && tar cf - org/bouncycastle/cert org/bouncycastle/cms ) | (cd $artifacts/bcpkix-jdk11-$base/src && tar xf -))
+    ((cd pkix/src/main/jdk1.1 && tar cf - * ) | (cd $artifacts/bcpkix-jdk11-$base/src && tar xf -))
+    ((cd pkix/src/test/java && tar cf - * ) | (cd $artifacts/bcpkix-jdk11-$base/src && tar xf -))
+    ((cd pkix/src/test/jdk1.3 && tar cf - org/bouncycastle/cert ) | (cd $artifacts/bcpkix-jdk11-$base/src && tar xf -))
+    ((cd pkix/src/test/jdk1.1 && tar cf - org/bouncycastle/cert ) | (cd $artifacts/bcpkix-jdk11-$base/src && tar xf -))
+    ((cd pkix/src/main/javadoc && tar cf - * ) | (cd $artifacts/bcpkix-jdk11-$base/src && tar xf -))
     (
-    cd bcpkix-jdk11-$base; mkdir classes; mkdir javadoc;
+    cd $artifacts/bcpkix-jdk11-$base; mkdir classes; mkdir javadoc;
 
     PATH=$JDK11PATH/bin:$PATH
     export PATH
@@ -497,29 +500,29 @@ then
     java -mx512m -classpath ../jce-jdk11-$base/classes:classes:$JDK11PATH/lib/classes.zip org.bouncycastle.cert.test.CertTest
     java -mx512m -classpath ../jce-jdk11-$base/classes:classes:$JDK11PATH/lib/classes.zip org.bouncycastle.cert.test.AttrCertTest
     java -mx512m -classpath ../jce-jdk11-$base/classes:classes:$JDK11PATH/lib/classes.zip org.bouncycastle.cert.test.PKCS10Test
-    # java -classpath ../jce-jdk11-$base/classes:classes:$JDK11PATH/lib/classes.zip org.bouncycastle.openssl.test.ReaderTest
+    # java -classpath ../$artifacts/jce-jdk11-$base/classes:classes:$JDK11PATH/lib/classes.zip org.bouncycastle.openssl.test.ReaderTest
     )
 
-    (2>&1 find bcpkix-jdk11-$base -name CVS -exec rm -rf \{\} \;) > /dev/null
+    (2>&1 find $artifacts/bcpkix-jdk11-$base -name CVS -exec rm -rf \{\} \;) > /dev/null
 fi
 
-if test "$base" != "" -a ! -d bcpg-jdk11-$base
+if test "$base" != "" -a ! -d $artifacts/bcpg-jdk11-$base
 then
     echo "making OpenPGP release"
 
-    mkdir bcpg-jdk11-$base
-    mkdir bcpg-jdk11-$base/src
-    tar cf - index.html LICENSE.html CONTRIBUTORS.html docs | (cd bcpg-jdk11-$base; tar xf -)
-    ((cd pg/src/main/java && tar cf - * ) | (cd bcpg-jdk11-$base/src && tar xf -))
-    ((cd pg/src/main/jdk1.4 && tar cf - * ) | (cd bcpg-jdk11-$base/src && tar xf -))
-    ((cd pg/src/main/jdk1.1 && tar cf - * ) | (cd bcpg-jdk11-$base/src && tar xf -))
-    ((cd pg/src/test/java && tar cf - * ) | (cd bcpg-jdk11-$base/src && tar xf -))
-    ((cd pg/src/test/jdk1.4 && tar cf - * ) | (cd bcpg-jdk11-$base/src && tar xf -))
-    ((cd pg/src/test/jdk1.3 && tar cf - * ) | (cd bcpg-jdk11-$base/src && tar xf -))
-    ((cd pg/src/test/jdk1.1 && tar cf - * ) | (cd bcpg-jdk11-$base/src && tar xf -))
-    ((cd pg/src/main/javadoc && tar cf - * ) | (cd bcpg-jdk11-$base/src && tar xf -))
+    mkdir $artifacts/bcpg-jdk11-$base
+    mkdir $artifacts/bcpg-jdk11-$base/src
+    tar cf - index.html LICENSE.html CONTRIBUTORS.html docs | (cd $artifacts/bcpg-jdk11-$base; tar xf -)
+    ((cd pg/src/main/java && tar cf - * ) | (cd $artifacts/bcpg-jdk11-$base/src && tar xf -))
+    ((cd pg/src/main/jdk1.4 && tar cf - * ) | (cd $artifacts/bcpg-jdk11-$base/src && tar xf -))
+    ((cd pg/src/main/jdk1.1 && tar cf - * ) | (cd $artifacts/bcpg-jdk11-$base/src && tar xf -))
+    ((cd pg/src/test/java && tar cf - * ) | (cd $artifacts/bcpg-jdk11-$base/src && tar xf -))
+    ((cd pg/src/test/jdk1.4 && tar cf - * ) | (cd $artifacts/bcpg-jdk11-$base/src && tar xf -))
+    ((cd pg/src/test/jdk1.3 && tar cf - * ) | (cd $artifacts/bcpg-jdk11-$base/src && tar xf -))
+    ((cd pg/src/test/jdk1.1 && tar cf - * ) | (cd $artifacts/bcpg-jdk11-$base/src && tar xf -))
+    ((cd pg/src/main/javadoc && tar cf - * ) | (cd $artifacts/bcpg-jdk11-$base/src && tar xf -))
     (
-    cd bcpg-jdk11-$base; mkdir classes; mkdir javadoc;
+    cd $artifacts/bcpg-jdk11-$base; mkdir classes; mkdir javadoc;
 
     PATH=$JDK11PATH/bin:$PATH
     export PATH
@@ -570,12 +573,12 @@ q
     (cd src/org/bouncycastle; javac -d ../../../classes -classpath ../../../classes:../../../src:../../../../jce-jdk11-$base/classes:$JDK11PATH/lib/classes.zip openpgp/*/*.java openpgp/*/*/*.java )
     (cd src/org/bouncycastle; javac -d ../../../classes -classpath ../../../classes:../../../src:../../../../jce-jdk11-$base/classes:$JDK11PATH/lib/classes.zip openpgp/test/RegressionTest.java )
 
-    cp ../pg/src/test/resources/org/bouncycastle/openpgp/test/bigpub.asc classes/org/bouncycastle/openpgp/test/bigpub.asc
+    cp ../../../../pg/src/test/resources/org/bouncycastle/openpgp/test/bigpub.asc classes/org/bouncycastle/openpgp/test/bigpub.asc
 
     java -mx512m -classpath ../jce-jdk11-$base/classes:classes:$JDK11PATH/lib/classes.zip org.bouncycastle.openpgp.test.RegressionTest
 
     )
 
-    (2>&1 find bcpg-jdk11-$base -name CVS -exec rm -rf \{\} \;) > /dev/null
+    (2>&1 find $artifacts/bcpg-jdk11-$base -name CVS -exec rm -rf \{\} \;) > /dev/null
 fi
 
diff --git a/build1-2 b/build1-2
index 301e9205..6ab8ab38 100644
--- a/build1-2
+++ b/build1-2
@@ -15,31 +15,34 @@ WINDOWTITLE="Bouncy Castle Cryptography $version API Specification"
 HEADER="<b>Bouncy Castle Cryptography $version</b>"
 DOCTITLE="Bouncy Castle $version API Specification"
 
-if test "$base" != ""  -a ! -d lcrypto-jdk12-$base
+artifacts=build/artifacts/jdk1.2
+mkdir -p $artifacts
+
+if test "$base" != ""  -a ! -d $artifacts/lcrypto-jdk12-$base
 then
     echo "making lightweight release"
 
-    mkdir lcrypto-jdk12-$base
-    mkdir lcrypto-jdk12-$base/src
-    tar cf - index.html LICENSE.html CONTRIBUTORS.html docs | (cd lcrypto-jdk12-$base && tar xf -)
+    mkdir $artifacts/lcrypto-jdk12-$base
+    mkdir $artifacts/lcrypto-jdk12-$base/src
+    tar cf - index.html LICENSE.html CONTRIBUTORS.html docs | (cd $artifacts/lcrypto-jdk12-$base && tar xf -)
     (cd core/src/main/java && tar cf - org/bouncycastle/LICENSE.java \
     org/bouncycastle/math org/bouncycastle/crypto org/bouncycastle/util org/bouncycastle/asn1 org/bouncycastle/pqc/math org/bouncycastle/pqc/crypto org/bouncycastle/pqc/asn1 ) \
-     | (cd lcrypto-jdk12-$base/src && tar xf -)
+     | (cd $artifacts/lcrypto-jdk12-$base/src && tar xf -)
     (cd core/src/main/javadoc && tar cf -  \
     org/bouncycastle/math org/bouncycastle/crypto org/bouncycastle/util org/bouncycastle/asn1 ) \
-     | (cd lcrypto-jdk12-$base/src && tar xf -)
+     | (cd $artifacts/lcrypto-jdk12-$base/src && tar xf -)
     (cd core/src/main/jdk1.4 && tar cf - org/bouncycastle/util) \
-     | (cd lcrypto-jdk12-$base/src && tar xf -)
+     | (cd $artifacts/lcrypto-jdk12-$base/src && tar xf -)
     (cd core/src/main/jdk1.3 && tar cf - org/bouncycastle/asn1 org/bouncycastle/crypto) \
-     | (cd lcrypto-jdk12-$base/src && tar xf -)
+     | (cd $artifacts/lcrypto-jdk12-$base/src && tar xf -)
     (cd core/src/test/java && tar cf - org/bouncycastle/crypto org/bouncycastle/util org/bouncycastle/asn1) \
-     | (cd lcrypto-jdk12-$base/src && tar xf -)
+     | (cd $artifacts/lcrypto-jdk12-$base/src && tar xf -)
     (cd core/src/test/jdk1.3 && tar cf - org/bouncycastle/crypto) \
-     | (cd lcrypto-jdk12-$base/src && tar xf -)
+     | (cd $artifacts/lcrypto-jdk12-$base/src && tar xf -)
     (cd core/src/test/jdk1.2 && tar cf - org/bouncycastle/crypto) \
-     | (cd lcrypto-jdk12-$base/src && tar xf -)
+     | (cd $artifacts/lcrypto-jdk12-$base/src && tar xf -)
     (
-        cd lcrypto-jdk12-$base;
+        cd $artifacts/lcrypto-jdk12-$base;
 
         mkdir classes; mkdir javadoc;
 
@@ -127,45 +130,45 @@ then
 
         echo "lightweight regression test"
 
-        cp ../core/src/test/resources/org/bouncycastle/crypto/test/*.txt src/org/bouncycastle/crypto/test
-        cp ../core/src/test/resources/org/bouncycastle/crypto/test/*.txt classes/org/bouncycastle/crypto/test
-        cp ../core/src/test/resources/org/bouncycastle/asn1/test/*.data classes/org/bouncycastle/asn1/test
+        cp ../../../../core/src/test/resources/org/bouncycastle/crypto/test/*.txt src/org/bouncycastle/crypto/test
+        cp ../../../../core/src/test/resources/org/bouncycastle/crypto/test/*.txt classes/org/bouncycastle/crypto/test
+        cp ../../../../core/src/test/resources/org/bouncycastle/asn1/test/*.data classes/org/bouncycastle/asn1/test
 
         java -classpath classes -Dbc.test.data.home=../core/src/test/data org.bouncycastle.crypto.test.RegressionTest
         java -classpath classes org.bouncycastle.asn1.test.RegressionTest
     )
-    (2>&1 find lcrypto-jdk12-$base -name CVS -exec rm -rf \{\} \; ) > /dev/null
+    (2>&1 find $artifacts/lcrypto-jdk12-$base -name CVS -exec rm -rf \{\} \; ) > /dev/null
 fi
 
-if  test "$base" != "" -a ! -d jce-jdk12-$base
+if  test "$base" != "" -a ! -d $artifacts/jce-jdk12-$base
 then
     echo "making JCE release"
 
-    mkdir jce-jdk12-$base
-    mkdir jce-jdk12-$base/src
-    tar cf - index.html LICENSE.html CONTRIBUTORS.html docs | (cd jce-jdk12-$base; tar xf -)
-    ((cd jce/src/main/java && tar cf - *) | (cd jce-jdk12-$base/src && tar xf -))
-    ((cd core/src/main/java && tar cf - * ) | (cd jce-jdk12-$base/src && tar xf -))
-    ((cd core/src/main/jdk1.4 && tar cf - * ) | (cd jce-jdk12-$base/src && tar xf -))
-    ((cd core/src/main/jdk1.3 && tar cf - * ) | (cd jce-jdk12-$base/src && tar xf -))
-    ((cd core/src/main/jdk1.2 && tar cf - * ) | (cd jce-jdk12-$base/src && tar xf -))
-    ((cd core/src/test/java && tar cf - * ) | (cd jce-jdk12-$base/src && tar xf -))
-    ((cd core/src/test/jdk1.4 && tar cf - * ) | (cd jce-jdk12-$base/src && tar xf -))
-    ((cd core/src/test/jdk1.3 && tar cf - * ) | (cd jce-jdk12-$base/src && tar xf -))
-    ((cd core/src/test/jdk1.2 && tar cf - * ) | (cd jce-jdk12-$base/src && tar xf -))
-    ((cd core/src/main/javadoc && tar cf - * ) | (cd jce-jdk12-$base/src && tar xf -))
-    ((cd prov/src/main/java && tar cf - * ) | (cd jce-jdk12-$base/src && tar xf -))
-    ((cd prov/src/main/javadoc && tar cf - * ) | (cd jce-jdk12-$base/src && tar xf -))
-    ((cd prov/src/test/java && tar cf - * ) | (cd jce-jdk12-$base/src && tar xf -))
-    ((cd prov/src/main/jdk1.4 && tar cf - * ) | (cd jce-jdk12-$base/src && tar xf -))
-    ((cd prov/src/test/jdk1.4 && tar cf - * ) | (cd jce-jdk12-$base/src && tar xf -))
-    ((cd prov/src/main/jdk1.3 && tar cf - * ) | (cd jce-jdk12-$base/src && tar xf -))
-    ((cd prov/src/test/jdk1.3 && tar cf - * ) | (cd jce-jdk12-$base/src && tar xf -))
-    ((cd prov/src/main/jdk1.2 && tar cf - * ) | (cd jce-jdk12-$base/src && tar xf -))
+    mkdir $artifacts/jce-jdk12-$base
+    mkdir $artifacts/jce-jdk12-$base/src
+    tar cf - index.html LICENSE.html CONTRIBUTORS.html docs | (cd $artifacts/jce-jdk12-$base; tar xf -)
+    ((cd jce/src/main/java && tar cf - *) | (cd $artifacts/jce-jdk12-$base/src && tar xf -))
+    ((cd core/src/main/java && tar cf - * ) | (cd $artifacts/jce-jdk12-$base/src && tar xf -))
+    ((cd core/src/main/jdk1.4 && tar cf - * ) | (cd $artifacts/jce-jdk12-$base/src && tar xf -))
+    ((cd core/src/main/jdk1.3 && tar cf - * ) | (cd $artifacts/jce-jdk12-$base/src && tar xf -))
+    ((cd core/src/main/jdk1.2 && tar cf - * ) | (cd $artifacts/jce-jdk12-$base/src && tar xf -))
+    ((cd core/src/test/java && tar cf - * ) | (cd $artifacts/jce-jdk12-$base/src && tar xf -))
+    ((cd core/src/test/jdk1.4 && tar cf - * ) | (cd $artifacts/jce-jdk12-$base/src && tar xf -))
+    ((cd core/src/test/jdk1.3 && tar cf - * ) | (cd $artifacts/jce-jdk12-$base/src && tar xf -))
+    ((cd core/src/test/jdk1.2 && tar cf - * ) | (cd $artifacts/jce-jdk12-$base/src && tar xf -))
+    ((cd core/src/main/javadoc && tar cf - * ) | (cd $artifacts/jce-jdk12-$base/src && tar xf -))
+    ((cd prov/src/main/java && tar cf - * ) | (cd $artifacts/jce-jdk12-$base/src && tar xf -))
+    ((cd prov/src/main/javadoc && tar cf - * ) | (cd $artifacts/jce-jdk12-$base/src && tar xf -))
+    ((cd prov/src/test/java && tar cf - * ) | (cd $artifacts/jce-jdk12-$base/src && tar xf -))
+    ((cd prov/src/main/jdk1.4 && tar cf - * ) | (cd $artifacts/jce-jdk12-$base/src && tar xf -))
+    ((cd prov/src/test/jdk1.4 && tar cf - * ) | (cd $artifacts/jce-jdk12-$base/src && tar xf -))
+    ((cd prov/src/main/jdk1.3 && tar cf - * ) | (cd $artifacts/jce-jdk12-$base/src && tar xf -))
+    ((cd prov/src/test/jdk1.3 && tar cf - * ) | (cd $artifacts/jce-jdk12-$base/src && tar xf -))
+    ((cd prov/src/main/jdk1.2 && tar cf - * ) | (cd $artifacts/jce-jdk12-$base/src && tar xf -))
 
 
     (
-    cd jce-jdk12-$base; mkdir classes; mkdir javadoc;
+    cd $artifacts/jce-jdk12-$base; mkdir classes; mkdir javadoc;
 
     rm -rf src/org/bouncycastle/crypto/test/ntru
     rm -rf src/org/bouncycastle/pqc/math/ntru
@@ -349,26 +352,26 @@ then
     (cd classes; jar cf ../../jce-jdk12-$base.jar java javax org)
     )
 
-    ( 2>&1 find jce-jdk12-$base -name CVS -exec rm -rf \{\} \;) > /dev/null
+    ( 2>&1 find $artifacts/jce-jdk12-$base -name CVS -exec rm -rf \{\} \;) > /dev/null
 fi
 
-if test "$base" != "" -a ! -d bcpkix-jdk12-$base
+if test "$base" != "" -a ! -d $artifacts/bcpkix-jdk12-$base
 then
     echo "making PKIX release"
 
-    mkdir bcpkix-jdk12-$base
-    mkdir bcpkix-jdk12-$base/src
-    tar cf - index.html LICENSE.html CONTRIBUTORS.html docs | (cd bcpkix-jdk12-$base; tar xf -)
-    ((cd pkix/src/main/java && tar cf - * ) | (cd bcpkix-jdk12-$base/src && tar xf -))
-    ((cd pkix/src/main/jdk1.4 && tar cf - * ) | (cd bcpkix-jdk12-$base/src && tar xf -))
-    ((cd pkix/src/main/jdk1.3 && tar cf - * ) | (cd bcpkix-jdk12-$base/src && tar xf -))
-    ((cd pkix/src/main/jdk1.2 && tar cf - * ) | (cd bcpkix-jdk12-$base/src && tar xf -))
-    ((cd pkix/src/test/java && tar cf - * ) | (cd bcpkix-jdk12-$base/src && tar xf -))
-    ((cd pkix/src/test/jdk1.4 && tar cf - * ) | (cd bcpkix-jdk12-$base/src && tar xf -))
-    ((cd pkix/src/test/jdk1.3 && tar cf - * ) | (cd bcpkix-jdk12-$base/src && tar xf -))
-    ((cd pkix/src/main/javadoc && tar cf - * ) | (cd bcpkix-jdk12-$base/src && tar xf -))
+    mkdir $artifacts/bcpkix-jdk12-$base
+    mkdir $artifacts/bcpkix-jdk12-$base/src
+    tar cf - index.html LICENSE.html CONTRIBUTORS.html docs | (cd $artifacts/bcpkix-jdk12-$base; tar xf -)
+    ((cd pkix/src/main/java && tar cf - * ) | (cd $artifacts/bcpkix-jdk12-$base/src && tar xf -))
+    ((cd pkix/src/main/jdk1.4 && tar cf - * ) | (cd $artifacts/bcpkix-jdk12-$base/src && tar xf -))
+    ((cd pkix/src/main/jdk1.3 && tar cf - * ) | (cd $artifacts/bcpkix-jdk12-$base/src && tar xf -))
+    ((cd pkix/src/main/jdk1.2 && tar cf - * ) | (cd $artifacts/bcpkix-jdk12-$base/src && tar xf -))
+    ((cd pkix/src/test/java && tar cf - * ) | (cd $artifacts/bcpkix-jdk12-$base/src && tar xf -))
+    ((cd pkix/src/test/jdk1.4 && tar cf - * ) | (cd $artifacts/bcpkix-jdk12-$base/src && tar xf -))
+    ((cd pkix/src/test/jdk1.3 && tar cf - * ) | (cd $artifacts/bcpkix-jdk12-$base/src && tar xf -))
+    ((cd pkix/src/main/javadoc && tar cf - * ) | (cd $artifacts/bcpkix-jdk12-$base/src && tar xf -))
     (
-    cd bcpkix-jdk12-$base; mkdir classes; mkdir javadoc;
+    cd $artifacts/bcpkix-jdk12-$base; mkdir classes; mkdir javadoc;
 
     PATH=$JDK12PATH/bin:$PATH
     export PATH
@@ -443,24 +446,24 @@ Implementation-Version: $version.0
     java -classpath ../jce-jdk12-$base.jar:classes org.bouncycastle.cert.test.X509ExtensionUtilsTest
     )
 
-    (2>&1 find bcpkix-jdk12-$base -name CVS -exec rm -rf \{\} \;) > /dev/null
+    (2>&1 find $artifacts/bcpkix-jdk12-$base -name CVS -exec rm -rf \{\} \;) > /dev/null
 fi
 
-if test "$base" != "" -a ! -d bcpg-jdk12-$base
+if test "$base" != "" -a ! -d $artifacts/bcpg-jdk12-$base
 then
     echo "making OpenPGP release"
 
-    mkdir bcpg-jdk12-$base
-    mkdir bcpg-jdk12-$base/src
-    tar cf - index.html LICENSE.html CONTRIBUTORS.html docs | (cd bcpg-jdk12-$base; tar xf -)
-    ((cd pg/src/main/java && tar cf - * ) | (cd bcpg-jdk12-$base/src && tar xf -))
-    ((cd pg/src/main/jdk1.4 && tar cf - * ) | (cd bcpg-jdk12-$base/src && tar xf -))
-    ((cd pg/src/test/java && tar cf - * ) | (cd bcpg-jdk12-$base/src && tar xf -))
-    ((cd pg/src/test/jdk1.4 && tar cf - * ) | (cd bcpg-jdk12-$base/src && tar xf -))
-    ((cd pg/src/test/jdk1.3 && tar cf - * ) | (cd bcpg-jdk12-$base/src && tar xf -))
-    ((cd pg/src/main/javadoc && tar cf - * ) | (cd bcpg-jdk12-$base/src && tar xf -))
+    mkdir $artifacts/bcpg-jdk12-$base
+    mkdir $artifacts/bcpg-jdk12-$base/src
+    tar cf - index.html LICENSE.html CONTRIBUTORS.html docs | (cd $artifacts/bcpg-jdk12-$base; tar xf -)
+    ((cd pg/src/main/java && tar cf - * ) | (cd $artifacts/bcpg-jdk12-$base/src && tar xf -))
+    ((cd pg/src/main/jdk1.4 && tar cf - * ) | (cd $artifacts/bcpg-jdk12-$base/src && tar xf -))
+    ((cd pg/src/test/java && tar cf - * ) | (cd $artifacts/bcpg-jdk12-$base/src && tar xf -))
+    ((cd pg/src/test/jdk1.4 && tar cf - * ) | (cd $artifacts/bcpg-jdk12-$base/src && tar xf -))
+    ((cd pg/src/test/jdk1.3 && tar cf - * ) | (cd $artifacts/bcpg-jdk12-$base/src && tar xf -))
+    ((cd pg/src/main/javadoc && tar cf - * ) | (cd $artifacts/bcpg-jdk12-$base/src && tar xf -))
     (
-    cd bcpg-jdk12-$base; mkdir classes; mkdir javadoc;
+    cd $artifacts/bcpg-jdk12-$base; mkdir classes; mkdir javadoc;
 
     PATH=$JDK12PATH/bin:$PATH
     export PATH
@@ -516,13 +519,13 @@ Implementation-Vendor: BouncyCastle.org
 Implementation-Version: $version.0
 %
 
-    cp ../pg/src/test/resources/org/bouncycastle/openpgp/test/bigpub.asc classes/org/bouncycastle/openpgp/test/bigpub.asc
+    cp ../../../../pg/src/test/resources/org/bouncycastle/openpgp/test/bigpub.asc classes/org/bouncycastle/openpgp/test/bigpub.asc
 
     (cd classes; jar cmf pg.mf ../../bcpg-jdk12-$base.jar org)
     java -classpath ../jce-jdk12-$base.jar:classes org.bouncycastle.openpgp.test.RegressionTest
 
     )
 
-    (2>&1 find bcpg-jdk12-$base -name CVS -exec rm -rf \{\} \;) > /dev/null
+    (2>&1 find $artifacts/bcpg-jdk12-$base -name CVS -exec rm -rf \{\} \;) > /dev/null
 fi
 
diff --git a/core/src/main/java/org/bouncycastle/math/ec/ECCurve.java b/core/src/main/java/org/bouncycastle/math/ec/ECCurve.java
index 9ddbc993..4bd2fd2a 100644
--- a/core/src/main/java/org/bouncycastle/math/ec/ECCurve.java
+++ b/core/src/main/java/org/bouncycastle/math/ec/ECCurve.java
@@ -454,7 +454,7 @@ public abstract class ECCurve
 
         protected ECPoint decompressPoint(int yTilde, BigInteger X1)
         {
-            ECFieldElement x = fromBigInteger(X1);
+            ECFieldElement x = this.fromBigInteger(X1);
             ECFieldElement rhs = x.square().add(a).multiply(x).add(b);
             ECFieldElement y = rhs.sqrt();
 
@@ -472,7 +472,7 @@ public abstract class ECCurve
                 y = y.negate();
             }
 
-            return createRawPoint(x, y, true);
+            return this.createRawPoint(x, y, true);
         }
     }
 
diff --git a/core/src/main/java/org/bouncycastle/math/ec/ECPoint.java b/core/src/main/java/org/bouncycastle/math/ec/ECPoint.java
index f4c1d80d..ec320f00 100644
--- a/core/src/main/java/org/bouncycastle/math/ec/ECPoint.java
+++ b/core/src/main/java/org/bouncycastle/math/ec/ECPoint.java
@@ -534,7 +534,7 @@ public abstract class ECPoint
             ECFieldElement X = this.x, Y = this.y, A = curve.getA(), B = curve.getB();
             ECFieldElement lhs = Y.square();
 
-            switch (getCurveCoordinateSystem())
+            switch (this.getCurveCoordinateSystem())
             {
             case ECCurve.COORD_AFFINE:
                 break;
@@ -579,7 +579,7 @@ public abstract class ECPoint
             }
 
             // Add -b
-            return add(b.negate());
+            return this.add(b.negate());
         }
     }
 
@@ -1347,7 +1347,7 @@ public abstract class ECPoint
 
         protected boolean satisfiesCurveEquation()
         {
-            ECCurve curve = getCurve();
+            ECCurve curve = this.getCurve();
             ECFieldElement X = this.x, A = curve.getA(), B = curve.getB();
             
             int coord = curve.getCoordinateSystem();