ML-DSA: Remove internalGenerateKeyPair method

- achieve seeded test cases using FixedSecureRandom

Author: peterdettman

core/src/main/java/org/bouncycastle/pqc/crypto/mldsa/MLDSAEngine.java

@@ -237,7 +237,7 @@ else if (this.DilithiumGamma1 == (1 << 19))
     }
 
     //Internal functions are deterministic. No randomness is sampled inside them
-    public byte[][] generateKeyPairInternal(byte[] seed)
+    private byte[][] generateKeyPairInternal(byte[] seed)
     {
         byte[] buf = new byte[2 * SeedBytes + CrhBytes];
         byte[] tr = new byte[TrBytes];

core/src/main/java/org/bouncycastle/pqc/crypto/mldsa/MLDSAKeyPairGenerator.java

@@ -10,47 +10,19 @@ public class MLDSAKeyPairGenerator
     implements AsymmetricCipherKeyPairGenerator
 {
     private MLDSAParameters dilithiumParams;
-
     private SecureRandom random;
 
-    private void initialize(
-        KeyGenerationParameters param)
+    public void init(KeyGenerationParameters param)
     {
         this.dilithiumParams = ((MLDSAKeyGenerationParameters)param).getParameters();
         this.random = param.getRandom();
     }
 
-    private AsymmetricCipherKeyPair genKeyPair()
-    {
-        MLDSAEngine engine = dilithiumParams.getEngine(random);
-
-        byte[][] keyPair = engine.generateKeyPair();
-        // System.out.println("pk gen = ");
-        // Helper.printByteArray(keyPair[0]);
-
-        MLDSAPublicKeyParameters pubKey = new MLDSAPublicKeyParameters(dilithiumParams, keyPair[0], keyPair[6]);
-        MLDSAPrivateKeyParameters privKey = new MLDSAPrivateKeyParameters(dilithiumParams, keyPair[0], keyPair[1], keyPair[2], keyPair[3], keyPair[4], keyPair[5], keyPair[6]);
-
-        return new AsymmetricCipherKeyPair(pubKey, privKey);
-    }
-
-    public void init(KeyGenerationParameters param)
-    {
-        this.initialize(param);
-    }
-
     public AsymmetricCipherKeyPair generateKeyPair()
-    {
-        return genKeyPair();
-    }
-    public AsymmetricCipherKeyPair internalGenerateKeyPair(byte[] seed)
     {
         MLDSAEngine engine = dilithiumParams.getEngine(random);
 
-        byte[][] keyPair = engine.generateKeyPairInternal(seed);
-        // System.out.println("pk gen = ");
-        // Helper.printByteArray(keyPair[0]);
-
+        byte[][] keyPair = engine.generateKeyPair();
         MLDSAPublicKeyParameters pubKey = new MLDSAPublicKeyParameters(dilithiumParams, keyPair[0], keyPair[6]);
         MLDSAPrivateKeyParameters privKey = new MLDSAPrivateKeyParameters(dilithiumParams, keyPair[0], keyPair[1], keyPair[2], keyPair[3], keyPair[4], keyPair[5], keyPair[6]);
 

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

@@ -1,26 +1,31 @@
 package org.bouncycastle.pqc.crypto.test;
 
-import junit.framework.TestCase;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.security.SecureRandom;
+import java.util.HashMap;
+import java.util.Map;
+
 import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
 import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.pqc.crypto.crystals.dilithium.*;
-import org.bouncycastle.pqc.crypto.mldsa.*;
+import org.bouncycastle.pqc.crypto.mldsa.MLDSAKeyGenerationParameters;
+import org.bouncycastle.pqc.crypto.mldsa.MLDSAKeyPairGenerator;
+import org.bouncycastle.pqc.crypto.mldsa.MLDSAParameters;
+import org.bouncycastle.pqc.crypto.mldsa.MLDSAPrivateKeyParameters;
+import org.bouncycastle.pqc.crypto.mldsa.MLDSAPublicKeyParameters;
+import org.bouncycastle.pqc.crypto.mldsa.MLDSASigner;
 import org.bouncycastle.pqc.crypto.util.PrivateKeyFactory;
 import org.bouncycastle.pqc.crypto.util.PrivateKeyInfoFactory;
 import org.bouncycastle.pqc.crypto.util.PublicKeyFactory;
 import org.bouncycastle.pqc.crypto.util.SubjectPublicKeyInfoFactory;
 import org.bouncycastle.test.TestResourceFinder;
 import org.bouncycastle.util.Arrays;
-
 import org.bouncycastle.util.encoders.Hex;
+import org.bouncycastle.util.test.FixedSecureRandom;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.security.SecureRandom;
-import java.util.HashMap;
-import java.util.Map;
+import junit.framework.TestCase;
 
 public class MLDSATest extends TestCase
 {
@@ -38,7 +43,6 @@ public void testKeyGen() throws IOException
                 MLDSAParameters.ml_dsa_87,
         };
 
-        TestSampler sampler = new TestSampler();
         for (int fileIndex = 0; fileIndex != files.length; fileIndex++)
         {
             String name = files[fileIndex];
@@ -64,28 +68,26 @@ public void testKeyGen() throws IOException
                         byte[] pk = Hex.decode((String) buf.get("pk"));
                         byte[] sk = Hex.decode((String) buf.get("sk"));
 
+                        FixedSecureRandom random = new FixedSecureRandom(seed);
                         MLDSAParameters parameters = params[fileIndex];
 
                         MLDSAKeyPairGenerator kpGen = new MLDSAKeyPairGenerator();
-                        MLDSAKeyGenerationParameters genParam = new MLDSAKeyGenerationParameters(new SecureRandom(), parameters);
+                        kpGen.init(new MLDSAKeyGenerationParameters(random, parameters));
+
                         //
                         // Generate keys and test.
                         //
-                        kpGen.init(genParam);
-                        AsymmetricCipherKeyPair kp = kpGen.internalGenerateKeyPair(seed);
+                        AsymmetricCipherKeyPair kp = kpGen.generateKeyPair();
 
                         MLDSAPublicKeyParameters pubParams = (MLDSAPublicKeyParameters) PublicKeyFactory.createKey(
-                                SubjectPublicKeyInfoFactory.createSubjectPublicKeyInfo(kp.getPublic()));
+                            SubjectPublicKeyInfoFactory.createSubjectPublicKeyInfo(kp.getPublic()));
                         MLDSAPrivateKeyParameters privParams = (MLDSAPrivateKeyParameters) PrivateKeyFactory.createKey(
-                                PrivateKeyInfoFactory.createPrivateKeyInfo(kp.getPrivate()));
-
+                            PrivateKeyInfoFactory.createPrivateKeyInfo(kp.getPrivate()));
 
                         assertTrue(name + ": public key", Arrays.areEqual(pk, pubParams.getEncoded()));
                         assertTrue(name + ": secret key", Arrays.areEqual(sk, privParams.getEncoded()));
-
                     }
                     buf.clear();
-
                     continue;
                 }
 
@@ -113,7 +115,6 @@ public void testSigGen() throws IOException
                 MLDSAParameters.ml_dsa_87,
         };
 
-        TestSampler sampler = new TestSampler();
         for (int fileIndex = 0; fileIndex != files.length; fileIndex++)
         {
             String name = files[fileIndex];
@@ -185,7 +186,6 @@ public void testSigVer() throws IOException
                 MLDSAParameters.ml_dsa_87,
         };
 
-        TestSampler sampler = new TestSampler();
         for (int fileIndex = 0; fileIndex != files.length; fileIndex++)
         {
             String name = files[fileIndex];