Merge branch 'main' into shamir-secret-splitting

Author: gefeili

.gitlab-ci.yml

@@ -2,6 +2,7 @@ stages:
   - check
   - build
   - test
+  - publish
   - sync
 
 check-code:
@@ -52,6 +53,13 @@ test-code:
         - "mls/build/test-results/**/*.xml"
 
 
+publish:
+  stage: publish
+  script:
+    - "apply_overlay bc-java-pub ./"
+    - "ecr_login"
+    - "ecr_pull vm_base_intel latest"
+    - "ci_docker_run \"vm_base_intel:latest\" \"bc-java\" \"/workspace/bc-java/ci/pub.sh\""
 
 spongycastle:
   stage: "sync"

ant/bc+-build.xml

@@ -1012,7 +1012,7 @@
         <property name="test.target.src.dir" value="${test.target.dir}/src" />
 
         <mkdir dir="${basedir}/${build.dir}/${target.prefix}" />
-        <junit fork="yes" dir="${basedir}/${build.dir}/${target.prefix}" failureProperty="test.failed" printsummary="${junit.printsummary}">
+        <junit fork="yes" dir="${basedir}/${build.dir}/${target.prefix}" failureProperty="test.failed" printsummary="${junit.printsummary}" maxmemory="1536m">
             <classpath>
                 <path refid="project.classpath" /> 
                 <fileset dir="${artifacts.jars.dir}">

ant/build.regexp

@@ -1,3 +1,3 @@
 
-regexp: <List<PGPSignature>>|<Map<CertID, OCSPResponse>>|<URI[^>]*>>|<[A-Z?][^>@]*[a-zA-Z0-9\\]]>|<[A-Z]>|<[a-z][^>@]*[a-z\\]]>|@SuppressWarnings(.*)|@Override|@Deprecated|@FunctionalInterface
+regexp: <List<PGPSignature>>|<Map<CertID, OCSPResponse>>|<URI[^>]*\\>>|<[A-Z?][^>@]*[a-zA-Z0-9\\]]>|<[A-Z]>|<[a-z][^>@]*[a-z\\]]>|@SuppressWarnings(.*)|@Override|@Deprecated|@FunctionalInterface
 

ant/jdk14.xml

@@ -77,6 +77,7 @@
                 <exclude name="**/JDKPKCS12StoreParameter.java"/>
                 <exclude name="**/SIKE*.java"/>
                 <exclude name="**/CompositeSign*.java"/>
+                <exclude name="**/COMPOSITE*.java"/>
                 <exclude name="**/rainbow/*.java"/>
                 <exclude name="**/Rainbow*.java"/>
                 <exclude name="**/XMS*.java"/>
@@ -131,6 +132,9 @@
                 <exclude name="**/keybox/**/*.java"/>
                 <exclude name="**/gpg/test/*.java"/>
                 <exclude name="**/BcImplProviderTest.java"/>
+                <exclude name="**/OperatorJcajceTest.java"/>
+                <exclude name="**/AEADWithArgon2Test.java"/>
+                <exclude name="**/AEADProtectedPGPSecretKeyTest.java"/>
             </fileset>
             <fileset dir="pkix/src/test/java">
                 <exclude name="**/est/**/*.java"/>
@@ -142,6 +146,7 @@
                 <exclude name="**/bouncycastle/cms/test/*AuthEnvelopedData*Test.java"/>
                 <exclude name="**/PKIXRevocationTest.java"/>
 		<exclude name="**/its/**/*.java"/>
+                <exclude name="**/CheckNameConstraintsTest.java"/>
             </fileset>
             <fileset dir="mail/src/test/java">
 		<exclude name="**/MailGeneralTest.java"/>
@@ -224,6 +229,13 @@
         </copy>
 
         <replaceregexp match="${regexp}" replace=" " flags="g" byline="true">
+            <fileset dir="${src.dir}">
+                <include name="**/*.java"/>
+                <exclude name="**/SICBlockCipher.java"/>
+                <exclude name="**/MultipartParserTest.java"/>
+            </fileset>
+        </replaceregexp>
+        <replaceregexp match="StringBuilder" replace="StringBuffer" flags="g" byline="true">
             <fileset dir="${src.dir}">
                 <include name="**/*.java"/>
                 <exclude name="**/MultipartParserTest.java"/>
@@ -232,6 +244,7 @@
         <replaceregexp match="(List|Map|Set|Iterator) >" replace="\1" flags="g" byline="true">
             <fileset dir="${src.dir}">
                 <include name="**/*.java"/>
+                <exclude name="**/SICBlockCipher.java"/>
                 <exclude name="**/MultipartParserTest.java"/>
             </fileset>
         </replaceregexp>

ant/jdk15+.xml

@@ -39,22 +39,18 @@
             <fileset dir="prov/src/test/resources" includes="**/*.*" />
 
             <fileset dir="tls/src/main/java" includes="**/*.java" />
-            <fileset dir="tls/src/main/jdk1.5" includes="**/*.java" />
             <fileset dir="tls/src/main/javadoc" includes="**/*.html" />
             <fileset dir="tls/src/test/java" includes="**/*.java" />
-            <fileset dir="tls/src/test/jdk1.5" includes="**/*.java" />
             <fileset dir="tls/src/test/resources" includes="**/*.*" />
 
             <fileset dir="pkix/src/main/java" includes="**/*.java" />
-            <fileset dir="pkix/src/main/jdk1.5" includes="**/*.java" />
             <fileset dir="pkix/src/main/javadoc" includes="**/*.html" />
             <fileset dir="pkix/src/main/resources" includes="**/*.properties" />
             <fileset dir="pkix/src/test/java" includes="**/*.java" />
             <fileset dir="pkix/src/test/javadoc" includes="**/*.html" />
             <fileset dir="pkix/src/test/resources" includes="**/*.*" />
 
             <fileset dir="pg/src/main/java" includes="**/*.java" />
-            <fileset dir="pg/src/main/jdk1.5" includes="**/*.java" />
             <fileset dir="pg/src/main/javadoc" includes="**/*.html" />
             <fileset dir="pg/src/main/java" includes="**/*.properties" />
             <fileset dir="pg/src/test/java" includes="**/*.java" />
@@ -74,6 +70,14 @@
             <fileset dir="mail/src/test/resources" includes="**/*.*" />
 
         </copy>
+        <copy todir="${src.dir}" overwrite="true">
+            <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" />
+            <fileset dir="pg/src/main/jdk1.5" includes="**/*.java" />
+            <fileset dir="pg/src/test/jdk1.5" includes="**/*.java" />
+        </copy>
+
         <available classname="com.puppycrawl.tools.checkstyle.CheckStyleTask" property="checkstyle.on" />
     </target>
 

bc-build.properties

@@ -3,10 +3,10 @@
 # intended to hold user-specific settings that are *not* committed to 
 # the repository.
 
-release.suffix: 1.79b01
-release.name: 1.78.99
-release.version: 1.78.99
-release.debug: true
+release.suffix: 1.79
+release.name: 1.79
+release.version: 1.79
+release.debug: false
 
 mail.jar.home: ./libs/javax.mail-1.4.7.jar
 activation.jar.home:  ./libs/activation-1.1.1.jar

build.gradle

@@ -7,11 +7,13 @@ buildscript {
 
 }
 
+
 plugins {
     id "io.spring.nohttp" version "0.0.11"
     id "checkstyle"
     id "jacoco"
     id "net.ltgt.errorprone" version "3.1.0"
+    id 'maven-publish'
 }
 
 println("Environment setup:")
@@ -160,6 +162,7 @@ allprojects {
         }
     }
 
+
 }
 
 task printProperties {
@@ -183,6 +186,7 @@ ext {
 
 subprojects {
     apply plugin: 'eclipse'
+    apply plugin: 'maven-publish'
 
 
     JavaVersion current = JavaVersion.current();
@@ -262,7 +266,7 @@ subprojects {
     }
 
     tasks.withType(JavaCompile).configureEach {
-        options.debug = true;
+        options.debug = false;
     }
 
     tasks.withType(Test).configureEach {
@@ -276,7 +280,12 @@ subprojects {
             languageVersion = JavaLanguageVersion.of(21)
         }
     }
+
 }
 
 
 test.dependsOn([':core:test', ':prov:test', ':prov:test11', ':prov:test15', ':prov:test21', ':pkix:test', 'pg:test', ':tls:test', 'mls:test', 'mail:test', 'jmail:test'])
+
+
+
+

ci/pub.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+set -e
+
+#
+# This script is for running inside the docker container
+#
+
+cd /workspace/bc-java
+source ci/common.sh
+
+
+
+export JAVA_HOME=`openjdk_21`
+export PATH=$JAVA_HOME/bin:$PATH
+
+
+./gradlew clean build publishAllPublicationsToCwmavenRepository -x test
+
+

core/build.gradle

@@ -15,3 +15,14 @@ test {
     maxParallelForks = 8;
 }
 
+publishing {
+    publications {
+        maven(MavenPublication) {
+            groupId = 'org.bouncycastle'
+            artifactId = "bccore-$vmrange"
+
+            from components.java
+
+        }
+    }
+}