added new data files.

merrymode · Oct 5, 2019 · 45ee51e · 45ee51e
1 parent 501875b
commit 45ee51e
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -966,3 +966,6 @@ codesigning.jks
 /out/test/tls/org/bouncycastle/tls/test/x509-server-rsa_pss_256.pem
 /out/test/tls/org/bouncycastle/tls/test/x509-server-rsa_pss_384.pem
 /out/test/tls/org/bouncycastle/tls/test/x509-server-rsa_pss_512.pem
+/out/test/core/META-INF/core.kotlin_module
+/out/test/core/org/bouncycastle/crypto/test/cavp/[original]_KDFCTR_gen.rsp
+/out/test/prov/META-INF/prov.kotlin_module
diff --git a/add_module.sh b/add_module.sh
@@ -1,4 +1,5 @@
 export JAVA_HOME=/usr/lib/jvm/java-9-oracle
+#export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64/
 export PATH=$JAVA_HOME/bin:$PATH
 
 if [ $# -ne 1 ]
@@ -25,15 +26,15 @@ rm -rf module.tmp
     pkixJar=`echo build/artifacts/jdk1.5/jars/bcpkix-jdk15on*.jar`
     if [ $1 = "prov" ]
     then
-	javac -classpath module.tmp/v5 -d module.tmp/v9 `find $1/src/main/jdk1.9 -name "*.java"` -sourcepath $1/src/main/jdk1.9:$1/src/main/java:core/src/main/java
+	javac -target 1.9 -classpath module.tmp/v5 -d module.tmp/v9 `find $1/src/main/jdk1.9 -name "*.java"` -sourcepath $1/src/main/jdk1.9:$1/src/main/java:core/src/main/java
     elif [ $1 = "prov-ext" ]
     then
-	javac -classpath module.tmp/v5 -d module.tmp/v9 `find prov/src/main/ext-jdk1.9 -name "*.java"` -sourcepath prov/src/main/ext-jdk1.9:prov/src/main/java:core/src/main/java
+	javac -target 1.9 -classpath module.tmp/v5 -d module.tmp/v9 `find prov/src/main/ext-jdk1.9 -name "*.java"` -sourcepath prov/src/main/ext-jdk1.9:prov/src/main/java:core/src/main/java
     elif [ $1 = "mail" ]
     then
-	javac --module-path ${provJar}:$pkixJar -classpath module.tmp/v5 -d module.tmp/v9 `find $1/src/main/jdk1.9 -name "*.java"` -sourcepath $1/src/main/jdk1.9:$1/src/main/java
+	javac  -target 1.9 --module-path ${provJar}:$pkixJar -classpath module.tmp/v5 -d module.tmp/v9 `find $1/src/main/jdk1.9 -name "*.java"` -sourcepath $1/src/main/jdk1.9:$1/src/main/java
     else
-	javac --module-path $provJar -classpath module.tmp/v5 -d module.tmp/v9 `find $1/src/main/jdk1.9 -name "*.java"` -sourcepath $1/src/main/jdk1.9:$1/src/main/java
+	javac  -target 1.9 --module-path $provJar -classpath module.tmp/v5 -d module.tmp/v9 `find $1/src/main/jdk1.9 -name "*.java"` -sourcepath $1/src/main/jdk1.9:$1/src/main/java
     fi
 )
 # Java 11 Step

diff --git a/bc-build.properties b/bc-build.properties
@@ -1,7 +1,7 @@
 
-release.suffix: 164b03
-release.name: 1.64b03
-release.version: 1.64.00.03
+release.suffix: 164b07
+release.name: 1.64b07
+release.version: 1.64.00.07
 release.debug: true
 
 mail.jar.home: ./libs/mail.jar

diff --git a/pg/src/test/resources/org/bouncycastle/openpgp/test/dsa-pubring.gpg b/pg/src/test/resources/org/bouncycastle/openpgp/test/dsa-pubring.gpg
diff --git a/pg/src/test/resources/org/bouncycastle/openpgp/test/rsa-pubring.gpg b/pg/src/test/resources/org/bouncycastle/openpgp/test/rsa-pubring.gpg