|
29 | 29 | import org.bouncycastle.test.TestResourceFinder; |
30 | 30 | import org.bouncycastle.util.Arrays; |
31 | 31 | import org.bouncycastle.util.encoders.Hex; |
| 32 | +import org.bouncycastle.util.test.FixedSecureRandom; |
32 | 33 |
|
33 | 34 | public class MLKEMTest |
34 | 35 | extends TestCase |
@@ -84,13 +85,13 @@ public void testKeyGen() throws IOException |
84 | 85 | MLKEMParameters parameters = params[fileIndex]; |
85 | 86 |
|
86 | 87 | MLKEMKeyPairGenerator kpGen = new MLKEMKeyPairGenerator(); |
87 | | - MLKEMKeyGenerationParameters genParam = new MLKEMKeyGenerationParameters(new SecureRandom(), parameters); |
| 88 | + MLKEMKeyGenerationParameters genParam = new MLKEMKeyGenerationParameters(new FixedSecureRandom(Arrays.concatenate(d, z)), parameters); |
88 | 89 |
|
89 | 90 | // |
90 | 91 | // Generate keys and test. |
91 | 92 | // |
92 | 93 | kpGen.init(genParam); |
93 | | - AsymmetricCipherKeyPair kp = kpGen.internalGenerateKeyPair(d, z); |
| 94 | + AsymmetricCipherKeyPair kp = kpGen.generateKeyPair(); |
94 | 95 |
|
95 | 96 | MLKEMPublicKeyParameters pubParams = (MLKEMPublicKeyParameters)PublicKeyFactory.createKey( |
96 | 97 | SubjectPublicKeyInfoFactory.createSubjectPublicKeyInfo((MLKEMPublicKeyParameters)kp.getPublic())); |
@@ -142,13 +143,13 @@ public void testKeyGenCombinedVectorSet() throws IOException |
142 | 143 | MLKEMParameters parameters = (MLKEMParameters)parametersMap.get((String)buf.get("parameterSet")); |
143 | 144 |
|
144 | 145 | MLKEMKeyPairGenerator kpGen = new MLKEMKeyPairGenerator(); |
145 | | - MLKEMKeyGenerationParameters genParam = new MLKEMKeyGenerationParameters(new SecureRandom(), parameters); |
| 146 | + MLKEMKeyGenerationParameters genParam = new MLKEMKeyGenerationParameters(new FixedSecureRandom(Arrays.concatenate(d, z)), parameters); |
146 | 147 |
|
147 | 148 | // |
148 | 149 | // Generate keys and test. |
149 | 150 | // |
150 | 151 | kpGen.init(genParam); |
151 | | - AsymmetricCipherKeyPair kp = kpGen.internalGenerateKeyPair(d, z); |
| 152 | + AsymmetricCipherKeyPair kp = kpGen.generateKeyPair(); |
152 | 153 |
|
153 | 154 | MLKEMPublicKeyParameters pubParams = (MLKEMPublicKeyParameters)PublicKeyFactory.createKey( |
154 | 155 | SubjectPublicKeyInfoFactory.createSubjectPublicKeyInfo((MLKEMPublicKeyParameters)kp.getPublic())); |
@@ -458,9 +459,9 @@ public void testMLKEM() |
458 | 459 | SecureRandom random = new SecureRandom(); |
459 | 460 | MLKEMKeyPairGenerator keyGen = new MLKEMKeyPairGenerator(); |
460 | 461 |
|
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)); |
462 | 463 |
|
463 | | - AsymmetricCipherKeyPair keyPair = keyGen.internalGenerateKeyPair(d, z); |
| 464 | + AsymmetricCipherKeyPair keyPair = keyGen.generateKeyPair(); |
464 | 465 | assertTrue(Arrays.areEqual(Hex.decode(expectedPubKey), ((MLKEMPublicKeyParameters)keyPair.getPublic()).getEncoded())); |
465 | 466 |
|
466 | 467 | assertTrue(Arrays.areEqual(Hex.decode(expectedPrivKey), ((MLKEMPrivateKeyParameters)keyPair.getPrivate()).getEncoded())); |
|
0 commit comments