Merge branch '2197-xmss-bds-initial' into 'main'

Fix the issue of XMSSPrivateKeyParameters when try to build BDS with seeds by...

See merge request root/bc-java!121

Author: dghgit

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/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/src/test/java/org/bouncycastle/pqc/jcajce/provider/test/XMSSTest.java

@@ -488,19 +488,19 @@ public void testKeyRebuild()
     {
         KeyPairGenerator kpg = KeyPairGenerator.getInstance("XMSS", "BCPQC");
 
-        kpg.initialize(new XMSSParameterSpec(10, XMSSParameterSpec.SHA256), new SecureRandom());
+        kpg.initialize(new XMSSParameterSpec(3, XMSSParameterSpec.SHA256), new SecureRandom());
 
         KeyPair kp = kpg.generateKeyPair();
 
         Signature sig = Signature.getInstance("SHA256withXMSS", "BCPQC");
 
         assertTrue(sig instanceof StateAwareSignature);
 
-        PrivateKey pKey1 = ((XMSSPrivateKey)kp.getPrivate()).extractKeyShard(5);
+        PrivateKey pKey1 = ((XMSSPrivateKey)kp.getPrivate()).extractKeyShard(7);
 
         sig.initSign(pKey1);
 
-        for (int i = 0; i != 5; i++)
+        for (int i = 0; i != 7; i++)
         {
             sig.update(msg, 0, msg.length);