Skip to content

Commit 9240e48

Browse files
committed
removed unnecessary public "internal" method.
1 parent a864750 commit 9240e48

File tree

2 files changed

+7
-16
lines changed

2 files changed

+7
-16
lines changed

core/src/main/java/org/bouncycastle/pqc/crypto/mlkem/MLKEMKeyPairGenerator.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,4 @@ public AsymmetricCipherKeyPair generateKeyPair()
4444
{
4545
return genKeyPair();
4646
}
47-
48-
public AsymmetricCipherKeyPair internalGenerateKeyPair(byte[] d, byte[] z)
49-
{
50-
byte[][] keyPair = mlkemParams.getEngine().generateKemKeyPairInternal(d, z);
51-
52-
MLKEMPublicKeyParameters pubKey = new MLKEMPublicKeyParameters(mlkemParams, keyPair[0], keyPair[1]);
53-
MLKEMPrivateKeyParameters privKey = new MLKEMPrivateKeyParameters(mlkemParams, keyPair[2], keyPair[3], keyPair[4], keyPair[0], keyPair[1], keyPair[5]);
54-
55-
return new AsymmetricCipherKeyPair(pubKey, privKey);
56-
}
5747
}

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import org.bouncycastle.test.TestResourceFinder;
3030
import org.bouncycastle.util.Arrays;
3131
import org.bouncycastle.util.encoders.Hex;
32+
import org.bouncycastle.util.test.FixedSecureRandom;
3233

3334
public class MLKEMTest
3435
extends TestCase
@@ -84,13 +85,13 @@ public void testKeyGen() throws IOException
8485
MLKEMParameters parameters = params[fileIndex];
8586

8687
MLKEMKeyPairGenerator kpGen = new MLKEMKeyPairGenerator();
87-
MLKEMKeyGenerationParameters genParam = new MLKEMKeyGenerationParameters(new SecureRandom(), parameters);
88+
MLKEMKeyGenerationParameters genParam = new MLKEMKeyGenerationParameters(new FixedSecureRandom(Arrays.concatenate(d, z)), parameters);
8889

8990
//
9091
// Generate keys and test.
9192
//
9293
kpGen.init(genParam);
93-
AsymmetricCipherKeyPair kp = kpGen.internalGenerateKeyPair(d, z);
94+
AsymmetricCipherKeyPair kp = kpGen.generateKeyPair();
9495

9596
MLKEMPublicKeyParameters pubParams = (MLKEMPublicKeyParameters)PublicKeyFactory.createKey(
9697
SubjectPublicKeyInfoFactory.createSubjectPublicKeyInfo((MLKEMPublicKeyParameters)kp.getPublic()));
@@ -142,13 +143,13 @@ public void testKeyGenCombinedVectorSet() throws IOException
142143
MLKEMParameters parameters = (MLKEMParameters)parametersMap.get((String)buf.get("parameterSet"));
143144

144145
MLKEMKeyPairGenerator kpGen = new MLKEMKeyPairGenerator();
145-
MLKEMKeyGenerationParameters genParam = new MLKEMKeyGenerationParameters(new SecureRandom(), parameters);
146+
MLKEMKeyGenerationParameters genParam = new MLKEMKeyGenerationParameters(new FixedSecureRandom(Arrays.concatenate(d, z)), parameters);
146147

147148
//
148149
// Generate keys and test.
149150
//
150151
kpGen.init(genParam);
151-
AsymmetricCipherKeyPair kp = kpGen.internalGenerateKeyPair(d, z);
152+
AsymmetricCipherKeyPair kp = kpGen.generateKeyPair();
152153

153154
MLKEMPublicKeyParameters pubParams = (MLKEMPublicKeyParameters)PublicKeyFactory.createKey(
154155
SubjectPublicKeyInfoFactory.createSubjectPublicKeyInfo((MLKEMPublicKeyParameters)kp.getPublic()));
@@ -458,9 +459,9 @@ public void testMLKEM()
458459
SecureRandom random = new SecureRandom();
459460
MLKEMKeyPairGenerator keyGen = new MLKEMKeyPairGenerator();
460461

461-
keyGen.init(new MLKEMKeyGenerationParameters(random, MLKEMParameters.ml_kem_1024));
462+
keyGen.init(new MLKEMKeyGenerationParameters(new FixedSecureRandom(Arrays.concatenate(d, z)), MLKEMParameters.ml_kem_1024));
462463

463-
AsymmetricCipherKeyPair keyPair = keyGen.internalGenerateKeyPair(d, z);
464+
AsymmetricCipherKeyPair keyPair = keyGen.generateKeyPair();
464465
assertTrue(Arrays.areEqual(Hex.decode(expectedPubKey), ((MLKEMPublicKeyParameters)keyPair.getPublic()).getEncoded()));
465466

466467
assertTrue(Arrays.areEqual(Hex.decode(expectedPrivKey), ((MLKEMPrivateKeyParameters)keyPair.getPrivate()).getEncoded()));

0 commit comments

Comments
 (0)