Merge branch '1.78.1' into 'main'

1.78.1

See merge request root/bc-java!11

Author: Administrator

bc-build.properties

@@ -3,9 +3,9 @@
 # intended to hold user-specific settings that are *not* committed to 
 # the repository.
 
-release.suffix: 178
-release.name: 1.78
-release.version: 1.78
+release.suffix: 17801
+release.name: 1.78.1
+release.version: 1.78.1
 release.debug: true
 
 mail.jar.home: ./libs/javax.mail-1.4.7.jar

build.gradle

@@ -246,7 +246,7 @@ subprojects {
     }
 
     tasks.withType(JavaCompile).configureEach {
-        options.debug = true;
+        options.debug = false;
     }
 
     tasks.withType(Test).configureEach {

core/src/main/java/org/bouncycastle/asn1/x509/Extensions.java

@@ -71,10 +71,8 @@ else if (obj != null)
     private Extensions(
         ASN1Sequence seq)
     {
-        if (seq.size() == 0)
-        {
-            throw new IllegalArgumentException("empty extension sequence found");
-        }
+        // it's tempting to check there's at least one entry in the sequence. Don't!
+        // It turns out there's quite a few empty extension blocks out there...
 
         Enumeration e = seq.getObjects();
 

docs/releasenotes.html

@@ -1,5 +1,6 @@
 org.gradle.jvmargs=-Xmx2g
-version=1.78
+version=1.78.1
+maxVersion=1.79
 org.gradle.java.installations.auto-detect=false
 org.gradle.java.installations.auto-download=false
 org.gradle.java.installations.fromEnv=BC_JDK8,BC_JDK11,BC_JDK17,BC_JDK21

gradle.properties

@@ -80,9 +80,11 @@ jar {
         from sourceSets.java9.output
     }
     manifest.attributes('Multi-Release': 'true')
+    manifest.attributes('Bundle-Name': 'bcjmail')
+    manifest.attributes('Bundle-SymbolicName': 'bcjmail')
     manifest.attributes('Bundle-RequiredExecutionEnvironment': 'JavaSE-1.8')
     manifest.attributes('Export-Package': 'org.bouncycastle.mail.*')
-    manifest.attributes('Import-Package': 'java.*;resolution:=optional;javax.*;resolution:=optional;org.bouncycastle.*;version="[2.73,4)"')
+    manifest.attributes('Import-Package': "java.*;resolution:=optional,javax.*;resolution:=optional,!org.bouncycastle.mail.*,org.bouncycastle.*;version=\"[${version},${maxVersion})\"")
 }
 
 task sourcesJar(type: Jar) {

jmail/build.gradle

@@ -60,9 +60,11 @@ jar {
         from sourceSets.java9.output
     }
     manifest.attributes('Multi-Release': 'true')
+    manifest.attributes('Bundle-Name': 'bcmail')
+    manifest.attributes('Bundle-SymbolicName': 'bcmail')
     manifest.attributes('Bundle-RequiredExecutionEnvironment': 'JavaSE-1.8')
     manifest.attributes('Export-Package': 'org.bouncycastle.mail.*')
-    manifest.attributes('Import-Package': 'java.*;resolution:=optional;javax.*;resolution:=optional;org.bouncycastle.*;version="[2.73,4)"')
+    manifest.attributes('Import-Package': "java.*;resolution:=optional,javax.*;resolution:=optional,!org.bouncycastle.mail.*,org.bouncycastle.*;version=\"[${version},${maxVersion})\"")
 }
 
 task sourcesJar(type: Jar) {

mail/build.gradle

@@ -153,10 +153,15 @@ jar {
     into('META-INF/versions/9') {
         from sourceSets.java9.output
     }
+
+    String packages = 'org.bouncycastle.mls.*'
+
     manifest.attributes('Multi-Release': 'true')
+    manifest.attributes('Bundle-Name': 'bcmls')
+    manifest.attributes('Bundle-SymbolicName': 'bcmls')
     manifest.attributes('Bundle-RequiredExecutionEnvironment': 'JavaSE-1.8')
-    manifest.attributes('Export-Package': 'org.bouncycastle.mls.*')
-    manifest.attributes('Import-Package': 'java.*;resolution:=optional;javax.*;resolution:=optional')
+    manifest.attributes('Export-Package': "${packages}")
+    manifest.attributes('Import-Package': "java.*;resolution:=optional,javax.*;resolution:=optional,!${packages},org.bouncycastle.*;version=\"[${version},${maxVersion})\"")
 }
 
 task sourcesJar(type: Jar) {

mls/build.gradle

@@ -16,15 +16,14 @@ dependencies {
     implementation project(':core')
     implementation project(':prov')
     implementation project(':util')
-    implementation files("$bc_prov")
-    implementation project(path: ':core')
 
     java9Implementation project(':prov')
     java9Implementation project(':util')
     java9Implementation files(sourceSets.main.output.classesDirs) {
         builtBy compileJava
     }
 
+    testImplementation group: 'junit', name: 'junit', version: '4.13.2'
 }
 
 compileJava {
@@ -43,7 +42,7 @@ compileJava9Java {
     sourceCompatibility = 9
     targetCompatibility = 9
     options.compilerArgs += [
-            '--module-path', "${bc_prov}"
+          '--module-path', "${bc_prov}${File.pathSeparator}${bc_util}"
     ]
 
     options.sourcepath = files(['src/main/java', 'src/main/jdk1.9'])
@@ -70,8 +69,10 @@ jar {
     }
     manifest.attributes('Multi-Release': 'true')
     manifest.attributes('Bundle-RequiredExecutionEnvironment': 'JavaSE-1.8')
+    manifest.attributes('Bundle-Name': 'bcpg')
+    manifest.attributes('Bundle-SymbolicName': 'bcpg')
     manifest.attributes('Export-Package': 'org.bouncycastle.{apache|bcpg|gpg|openpgp}.*')
-    manifest.attributes('Import-Package': 'java.*;resolution:=optional;javax.*;resolution:=optional')
+    manifest.attributes('Import-Package': "java.*;resolution:=optional,javax.*;resolution:=optional,!org.bouncycastle.{apache|bcpg|gpg|openpgp|}.*,org.bouncycastle.*;version=\"[${version},${maxVersion})\"")
 }
 
 

pg/build.gradle

@@ -132,7 +132,7 @@ private byte[] getEncodedPublicKey(
         return keyBytes;
     }
 
-    protected void getAttriubtesHash(PGPUserAttributeSubpacketVector userAttributes)
+    protected void getAttributesHash(PGPUserAttributeSubpacketVector userAttributes)
         throws PGPException
     {
         //