dealt with MR issues for TLS, PKIX, PG, and Mail jars.

aaxx · Mar 15, 2019 · 50ee43d · 50ee43d
1 parent ec57a1e
commit 50ee43d
Show file tree

Hide file tree

Showing 7 changed files with 1,475 additions and 1,380 deletions.
diff --git a/add_module.sh b/add_module.sh
@@ -43,26 +43,52 @@ then
 else
     for jarName in bc$1-jdk15on-*.jar
     do
+
         rm -rf module.tmp
-        mkdir -p module.tmp/META-INF/versions/9
-
-        cp build/artifacts/jdk1.5/jars/$jarName module.tmp
-        cd module.tmp
-        jar xf $jarName
-
-        provJar=`echo ../build/artifacts/jdk1.5/jars/bcprov-jdk15on*.jar`
-        pkixJar=`echo ../build/artifacts/jdk1.5/jars/bcpkix-jdk15on*.jar`
-
-        if [ $1 = "mail" ]
-        then
-            javac --module-path $provJar:$pkixJar -classpath . -d META-INF/versions/9 ../$1/src/main/jdk1.9/module-info.java -sourcepath ../$1/src/main/jdk1.9:../$1/src/main/java
-        else
-            javac --module-path $provJar -classpath . -d META-INF/versions/9 ../$1/src/main/jdk1.9/module-info.java -sourcepath ../$1/src/main/jdk1.9:../$1/src/main/java
-        fi
-
-
-        jar cfm $jarName META-INF/MANIFEST.MF META-INF org
-        cd ..
+
+        # Java 9 Step
+        (
+            export JAVA_HOME=/usr/lib/jvm/java-9-oracle
+            export PATH=$JAVA_HOME/bin:$PATH
+
+            mkdir -p module.tmp/v5
+            mkdir -p module.tmp/versions/v9
+            ( cd module.tmp/v5; jar xf ../../build/artifacts/jdk1.5/jars/$jarName )
+
+            provJar=`echo build/artifacts/jdk1.5/jars/bcprov-jdk15on*.jar`
+            pkixJar=`echo build/artifacts/jdk1.5/jars/bcpkix-jdk15on*.jar`
+            if [ $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
+            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
+            fi
+        )
+        # Java 11 Step
+        (
+            export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64
+            export PATH=$JAVA_HOME/bin:$PATH 
+
+            cd module.tmp
+            extras=`2>&1 jar cf $jarName -C v5 . --release 9 -C v9 . | egrep Warning | sed -e "s/Warning: entry //" | sed -e "s/ contains.*$//"`
+            for f in `echo $extras`
+            do
+                p=`echo $f | sed -e "s:META-INF/versions/9::"`
+                rm v9/$p
+            done
+        )
+        sh ./bnd.sh build/artifacts/jdk1.5/jars/$jarName
+        cp build/artifacts/jdk1.5/jars/$jarName module.tmp/$jarName
+        # Java 11 Step
+        (
+            export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64
+            export PATH=$JAVA_HOME/bin:$PATH 
+
+            cd module.tmp
+            jar uf $jarName --release 9 -C v9 .
+        )
         cp module.tmp/$jarName build/artifacts/jdk1.5/jars/$jarName
+
+    	bcsign build/artifacts/jdk1.5/jars/$jarName
     done
 fi
diff --git a/tls/src/main/java/org/bouncycastle/jsse/provider/ProvSSLContextSpi.java b/tls/src/main/java/org/bouncycastle/jsse/provider/ProvSSLContextSpi.java
@@ -506,14 +506,14 @@ protected void checkInitialized()
     protected synchronized SSLEngine engineCreateSSLEngine()
     {
         checkInitialized();
-        return new ProvSSLEngine(this, createContextData());
+        return ProvSSLEngine.create(this, createContextData());
     }
 
     @Override
     protected synchronized SSLEngine engineCreateSSLEngine(String host, int port)
     {
         checkInitialized();
-        return new ProvSSLEngine(this, createContextData(), host, port);
+        return ProvSSLEngine.create(this, createContextData(), host, port);
     }
 
     @Override