Merge branch 'main' of gitlab.cryptoworkshop.com:root/bc-java

Author: dghgit

build.gradle

@@ -287,7 +287,7 @@ configure(subprojects.findAll {it.name != 'bom'}) {
 }
 
 
-test.dependsOn([':core:test', ':prov:test', ':prov:test11', ':prov:test15', ':prov:test21', ':pkix:test', 'pg:test', ':tls:test', 'mls:test', 'mail:test', 'jmail:test'])
+test.dependsOn([':core:test', ':prov:test', ':prov:test11', ':prov:test15', ':prov:test17', ':pkix:test', 'pg:test', ':tls:test', 'mls:test', 'mail:test', 'jmail:test'])
 
 apply from: "publish.gradle"
 

core/src/main/java/org/bouncycastle/crypto/engines/Grain128Engine.java

@@ -188,7 +188,7 @@ private int getOutput()
         int s60 = lfsr[1] >>> 28 | lfsr[2] << 4;
         int s79 = lfsr[2] >>> 15 | lfsr[3] << 17;
         int s93 = lfsr[2] >>> 29 | lfsr[3] << 3;
-        int s94 = lfsr[2] >>> 31 | lfsr[3] << 1;
+        int s94 = lfsr[2] >>> 30 | lfsr[3] << 2;
 
         return b12 & s8 ^ s13 & s20 ^ b95 & s42 ^ s60 & s79 ^ b12 & b95 & s94 ^ s93
             ^ b2 ^ b15 ^ b36 ^ b45 ^ b64 ^ b73 ^ b89;

core/src/main/java/org/bouncycastle/pqc/crypto/xmss/XMSSPrivateKeyParameters.java

@@ -162,14 +162,7 @@ private XMSSPrivateKeyParameters(Builder builder)
             }
             else
             {
-                if (builder.index < ((1 << params.getHeight()) - 2) && tmpPublicSeed != null && tmpSecretKeySeed != null)
-                {
-                    bdsState = new BDS(params, tmpPublicSeed, tmpSecretKeySeed, (OTSHashAddress)new OTSHashAddress.Builder().build(), builder.index);
-                }
-                else
-                {
-                    bdsState = new BDS(params, (1 << params.getHeight()) - 1, builder.index);
-                }
+                bdsState = new BDS(params, tmpPublicSeed, tmpSecretKeySeed, (OTSHashAddress)new OTSHashAddress.Builder().build(), builder.index);
             }
             if (builder.maxIndex >= 0 && builder.maxIndex != bdsState.getMaxIndex())
             {
@@ -228,6 +221,7 @@ public XMSSPrivateKeyParameters getNextKey()
      * <p>
      * Note: this will use the range [index...index + usageCount) for the current key.
      * </p>
+     *
      * @param usageCount the number of usages the key should have.
      * @return a key based on the current key that can be used usageCount times.
      */
@@ -343,6 +337,10 @@ public Builder withPrivateKey(byte[] privateKeyVal)
 
         public XMSSPrivateKeyParameters build()
         {
+            if (!((privateKey != null) || (publicSeed != null && secretKeySeed != null)))
+            {
+                throw new IllegalStateException("publicSeed or secretKeySeed is null");
+            }
             return new XMSSPrivateKeyParameters(this);
         }
     }

core/src/test/java/org/bouncycastle/crypto/test/Grain128Test.java

@@ -15,8 +15,8 @@ public class Grain128Test
     extends SimpleTest
 {
 
-    String keyStream1 = "f09b7bf7d7f6b5c2de2ffc73ac21397f";
-    String keyStream2 = "afb5babfa8de896b4b9c6acaf7c4fbfd";
+    String keyStream1 = "4bdb20824c5dce6fc63e94456c3281d4";
+    String keyStream2 = "ba399daf90df8eba103d9ea83c805904";
 
     public String getName()
     {

core/src/test/java/org/bouncycastle/pqc/crypto/test/XMSSPrivateKeyTest.java

@@ -31,7 +31,8 @@ private void parsingTest(Digest digest)
     {
         XMSSParameters params = new XMSSParameters(10, digest);
         byte[] root = generateRoot(digest);
-        XMSSPrivateKeyParameters privateKey = new XMSSPrivateKeyParameters.Builder(params).withRoot(root).build();
+        XMSSPrivateKeyParameters privateKey = new XMSSPrivateKeyParameters.Builder(params).withRoot(root)
+            .withPublicSeed(new byte[digest.getDigestSize()]).withSecretKeySeed(new byte[digest.getDigestSize()]).build();
 
         byte[] export = privateKey.toByteArray();
 

prov/build.gradle

@@ -36,9 +36,9 @@ sourceSets {
             srcDirs = ['src/main/jdk1.15']
         }
     }
-    java21 {
+    java17 {
         java {
-            srcDirs = ['src/main/jdk21']
+            srcDirs = ['src/main/jdk17']
         }
     }
     java25 {
@@ -68,7 +68,7 @@ dependencies {
         builtBy compileJava11Java
     }
 
-    java21Implementation files([
+    java17Implementation files([
             sourceSets.main.output.classesDirs,
             sourceSets.java9.output.classesDirs,
             sourceSets.java11.output.classesDirs,
@@ -81,8 +81,8 @@ dependencies {
             sourceSets.java9.output.classesDirs,
             sourceSets.java11.output.classesDirs,
             sourceSets.java15.output.classesDirs,
-            sourceSets.java21.output.classesDirs]) {
-        builtBy compileJava21Java
+            sourceSets.java17.output.classesDirs]) {
+        builtBy compileJava17Java
     }
 }
 
@@ -106,9 +106,10 @@ compileJava15Java {
     options.sourcepath = files(['src/main/java', 'src/main/jdk1.15'])
 }
 
-compileJava21Java {
-    options.release = 21
-    options.sourcepath = files(['src/main/java', 'src/main/jdk21'])
+compileJava17Java {
+    targetCompatibility = 17
+    sourceCompatibility = 17
+    options.sourcepath = files(['src/main/java', 'src/main/jdk17'])
 }
 
 compileJava25Java {
@@ -132,8 +133,8 @@ task sourcesJar(type: Jar) {
     into('META-INF/versions/15') {
         from sourceSets.java15.allSource
     }
-    into('META-INF/versions/21') {
-        from sourceSets.java21.allSource
+    into('META-INF/versions/17') {
+        from sourceSets.java17.allSource
     }
     into('META-INF/versions/25') {
         from sourceSets.java25.allSource
@@ -154,8 +155,8 @@ jar {
     into('META-INF/versions/15') {
         from sourceSets.java15.output
     }
-    into('META-INF/versions/21') {
-        from sourceSets.java21.output
+    into('META-INF/versions/17') {
+        from sourceSets.java17.output
     }
     into('META-INF/versions/25') {
         from sourceSets.java25.output
@@ -208,11 +209,11 @@ sourceSets {
         }
     }
 
-    test21 {
+    test17 {
         java {
             compileClasspath += main.output + test.output
             runtimeClasspath += test.output
-            srcDir(files("src/test/jdk21"))
+            srcDir(files("src/test/jdk17"))
         }
     }
 
@@ -229,22 +230,22 @@ dependencies {
     java9Implementation project(':core')
     java11Implementation project(':core')
     java15Implementation project(':core')
-    java21Implementation project(':core')
+    java17Implementation project(':core')
     java25Implementation project(':core')
 }
 
 dependencies {
     test11Implementation group: 'junit', name: 'junit', version: '4.13.2'
     test15Implementation group: 'junit', name: 'junit', version: '4.13.2'
-    test21Implementation group: 'junit', name: 'junit', version: '4.13.2'
+    test17Implementation group: 'junit', name: 'junit', version: '4.13.2'
     test25Implementation group: 'junit', name: 'junit', version: '4.13.2'
     test11Implementation files('../libs/unboundid-ldapsdk-6.0.8.jar')
     test15Implementation files('../libs/unboundid-ldapsdk-6.0.8.jar')
-    test21Implementation files('../libs/unboundid-ldapsdk-6.0.8.jar')
+    test17Implementation files('../libs/unboundid-ldapsdk-6.0.8.jar')
     test25Implementation files('../libs/unboundid-ldapsdk-6.0.8.jar')
     test11Implementation(project(":core"))
     test15Implementation(project(":core"))
-    test21Implementation(project(":core"))
+    test17Implementation(project(":core"))
     test25Implementation(project(":core"))
     test25Implementation sourceSets.java25.output
 
@@ -264,9 +265,10 @@ compileTest15Java {
     options.sourcepath = files(['src/test/java', 'src/test/jdk1.15'])
 }
 
-compileTest21Java {
-    options.release = 21
-    options.sourcepath = files(['src/test/java', 'src/test/jdk21'])
+compileTest17Java {
+    targetCompatibility = 17
+    sourceCompatibility = 17
+    options.sourcepath = files(['src/test/java', 'src/test/jdk17'])
 }
 
 compileTest25Java {
@@ -291,7 +293,7 @@ publishing {
 configurations {
     test11Implementation.extendsFrom testImplementation
     test15Implementation.extendsFrom testImplementation
-    test21Implementation.extendsFrom testImplementation
+    test17Implementation.extendsFrom testImplementation
     test25Implementation.extendsFrom testImplementation
 }
 
@@ -396,14 +398,14 @@ task test15(type: Test) {
     }
 }
 
-task test21(type: Test) {
+task test17(type: Test) {
 
-    // This is testing the 21 code base
-    onlyIf {System.getenv("BC_JDK21") != null}
+    // This is testing the 17 code base
+    onlyIf {System.getenv("BC_JDK17") != null}
     dependsOn jar
 
-    testClassesDirs = sourceSets.test21.output.classesDirs
-    classpath = sourceSets.test21.runtimeClasspath + files(jar.archiveFile)
+    testClassesDirs = sourceSets.test17.output.classesDirs
+    classpath = sourceSets.test17.runtimeClasspath + files(jar.archiveFile)
 
     forkEvery = 1;
     maxParallelForks = 8;
@@ -413,10 +415,10 @@ task test21(type: Test) {
     testLogging.showStandardStreams = false
 
     javaLauncher = javaToolchains.launcherFor {
-        languageVersion = JavaLanguageVersion.of(21)
+        languageVersion = JavaLanguageVersion.of(17)
     }
 
-    jvmArgs = ['-Dtest.java.version.prefix=21']
+    jvmArgs = ['-Dtest.java.version.prefix=17']
 
 
     finalizedBy jacocoTestReport
@@ -477,9 +479,9 @@ if (System.getenv("BC_JDK17") != null) {
     test.dependsOn("test15")
 }
 
-if (System.getenv("BC_JDK21") != null) {
-    System.out.println("${project.name}: Adding test21 as dependency for test task because BC_JDK21 is defined")
-    test.dependsOn("test21")
+if (System.getenv("BC_JDK17") != null) {
+    System.out.println("${project.name}: Adding test17 as dependency for test task because BC_JDK17 is defined")
+    test.dependsOn("test17")
 }
 if (System.getenv("BC_JDK25") != null) {
     System.out.println("${project.name}: Adding test25 as dependency for test task because BC_JDK25 is defined")