Skip to content

Commit 3aacc92

Browse files
peterdettmanpeterdettman
committed
Refactor PQC tests
1 parent 24fff9f commit 3aacc92

File tree

3 files changed

+443
-332
lines changed

3 files changed

+443
-332
lines changed

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

Lines changed: 17 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,15 @@
3030
public class MLDSATest
3131
extends TestCase
3232
{
33+
private static final Map<String, MLDSAParameters> parametersMap = new HashMap<String, MLDSAParameters>()
34+
{
35+
{
36+
put("ML-DSA-44", MLDSAParameters.ml_dsa_44);
37+
put("ML-DSA-65", MLDSAParameters.ml_dsa_65);
38+
put("ML-DSA-87", MLDSAParameters.ml_dsa_87);
39+
}
40+
};
41+
3342
public void testKeyGen()
3443
throws IOException
3544
{
@@ -48,7 +57,6 @@ public void testKeyGen()
4857
for (int fileIndex = 0; fileIndex != files.length; fileIndex++)
4958
{
5059
String name = files[fileIndex];
51-
// System.out.println("testing: " + name);
5260
InputStream src = TestResourceFinder.findTestResource("pqc/crypto/dilithium/acvp", name);
5361
BufferedReader bin = new BufferedReader(new InputStreamReader(src));
5462

@@ -99,7 +107,6 @@ public void testKeyGen()
99107
buf.put(line.substring(0, a).trim(), line.substring(a + 1).trim());
100108
}
101109
}
102-
// System.out.println("testing successful!");
103110
}
104111
}
105112

@@ -121,7 +128,6 @@ public void testSigGen()
121128
for (int fileIndex = 0; fileIndex != files.length; fileIndex++)
122129
{
123130
String name = files[fileIndex];
124-
// System.out.println("testing: " + name);
125131
InputStream src = TestResourceFinder.findTestResource("pqc/crypto/dilithium/acvp", name);
126132
BufferedReader bin = new BufferedReader(new InputStreamReader(src));
127133

@@ -212,7 +218,7 @@ public void testSigVer()
212218
if (buf.size() > 0)
213219
{
214220
boolean testPassed = Boolean.parseBoolean((String)buf.get("testPassed"));
215-
String reason = buf.get("reason");
221+
String reason = (String)buf.get("reason");
216222
byte[] pk = Hex.decode((String)buf.get("pk"));
217223
byte[] message = Hex.decode((String)buf.get("message"));
218224
byte[] signature = Hex.decode((String)buf.get("signature"));
@@ -221,7 +227,6 @@ public void testSigVer()
221227

222228
MLDSAPublicKeyParameters pubParams = new MLDSAPublicKeyParameters(parameters, pk);
223229

224-
225230
InternalMLDSASigner verifier = new InternalMLDSASigner();
226231
verifier.init(false, pubParams);
227232

@@ -239,7 +244,6 @@ public void testSigVer()
239244
buf.put(line.substring(0, a).trim(), line.substring(a + 1).trim());
240245
}
241246
}
242-
// System.out.println("testing successful!");
243247
}
244248
}
245249

@@ -262,12 +266,12 @@ public void testRNG()
262266

263267
public void testMLDSARandom()
264268
{
265-
266269
MLDSAKeyPairGenerator keyGen = new MLDSAKeyPairGenerator();
267270

268271
SecureRandom random = new SecureRandom();
269272

270-
for (MLDSAParameters param : new MLDSAParameters[]{MLDSAParameters.ml_dsa_44, MLDSAParameters.ml_dsa_65, MLDSAParameters.ml_dsa_87})
273+
for (MLDSAParameters param : new MLDSAParameters[]{
274+
MLDSAParameters.ml_dsa_44, MLDSAParameters.ml_dsa_65, MLDSAParameters.ml_dsa_87})
271275
{
272276
keyGen.init(new MLDSAKeyGenerationParameters(random, param));
273277
for (int msgSize = 0; msgSize < 2049; )
@@ -313,15 +317,6 @@ public void testMLDSARandom()
313317

314318
boolean ok = verifier.verifySignature(sigGenerated);
315319

316-
if (!ok)
317-
{
318-
System.out.println("Verify failed");
319-
System.out.println("MSG:" + Hex.toHexString(msg));
320-
System.out.println("SIG: " + Hex.toHexString(sigGenerated));
321-
System.out.println("PK: " + Hex.toHexString(pkparam.getEncoded()));
322-
System.out.println("SK: " + Hex.toHexString(skparam.getEncoded()));
323-
}
324-
325320
assertTrue("count = " + i, ok);
326321
}
327322
}
@@ -331,19 +326,9 @@ public void testMLDSARandom()
331326
public void testKeyGenCombinedVectorSet()
332327
throws IOException
333328
{
334-
Map<String, MLDSAParameters> parametersMap = new HashMap<String, MLDSAParameters>()
335-
{
336-
{
337-
put("ML-DSA-44", MLDSAParameters.ml_dsa_44);
338-
put("ML-DSA-65", MLDSAParameters.ml_dsa_65);
339-
put("ML-DSA-87", MLDSAParameters.ml_dsa_87);
340-
}
341-
};
342-
343-
344329
InputStream src = TestResourceFinder.findTestResource("pqc/crypto/mldsa", "ML-DSA-keyGen.txt");
345330
BufferedReader bin = new BufferedReader(new InputStreamReader(src));
346-
331+
347332
String line = null;
348333
HashMap<String, String> buf = new HashMap<String, String>();
349334
while ((line = bin.readLine()) != null)
@@ -363,7 +348,7 @@ public void testKeyGenCombinedVectorSet()
363348
byte[] sk = Hex.decode((String)buf.get("sk"));
364349

365350
FixedSecureRandom random = new FixedSecureRandom(seed);
366-
MLDSAParameters parameters = parametersMap.get(buf.get("parameterSet"));
351+
MLDSAParameters parameters = parametersMap.get((String)buf.get("parameterSet"));
367352

368353
MLDSAKeyPairGenerator kpGen = new MLDSAKeyPairGenerator();
369354
kpGen.init(new MLDSAKeyGenerationParameters(random, parameters));
@@ -397,16 +382,6 @@ public void testKeyGenCombinedVectorSet()
397382
public void testSigGenCombinedVectorSet()
398383
throws IOException
399384
{
400-
Map<String, MLDSAParameters> parametersMap = new HashMap<String, MLDSAParameters>()
401-
{
402-
{
403-
put("ML-DSA-44", MLDSAParameters.ml_dsa_44);
404-
put("ML-DSA-65", MLDSAParameters.ml_dsa_65);
405-
put("ML-DSA-87", MLDSAParameters.ml_dsa_87);
406-
}
407-
};
408-
409-
410385
InputStream src = TestResourceFinder.findTestResource("pqc/crypto/mldsa", "ML-DSA-sigGen.txt");
411386
BufferedReader bin = new BufferedReader(new InputStreamReader(src));
412387

@@ -424,7 +399,7 @@ public void testSigGenCombinedVectorSet()
424399
{
425400
if (buf.size() > 0)
426401
{
427-
boolean deterministic = Boolean.valueOf(buf.get("deterministic"));
402+
boolean deterministic = Boolean.valueOf((String)buf.get("deterministic"));
428403
byte[] sk = Hex.decode((String)buf.get("sk"));
429404
byte[] message = Hex.decode((String)buf.get("message"));
430405
byte[] signature = Hex.decode((String)buf.get("signature"));
@@ -438,7 +413,7 @@ public void testSigGenCombinedVectorSet()
438413
rnd = new byte[32];
439414
}
440415

441-
MLDSAParameters parameters = parametersMap.get(buf.get("parameterSet"));
416+
MLDSAParameters parameters = parametersMap.get((String)buf.get("parameterSet"));
442417

443418
MLDSAPrivateKeyParameters privParams = new MLDSAPrivateKeyParameters(parameters, sk, null);
444419

@@ -468,16 +443,6 @@ public void testSigGenCombinedVectorSet()
468443
public void testSigVerCombinedVectorSet()
469444
throws IOException
470445
{
471-
Map<String, MLDSAParameters> parametersMap = new HashMap<String, MLDSAParameters>()
472-
{
473-
{
474-
put("ML-DSA-44", MLDSAParameters.ml_dsa_44);
475-
put("ML-DSA-65", MLDSAParameters.ml_dsa_65);
476-
put("ML-DSA-87", MLDSAParameters.ml_dsa_87);
477-
}
478-
};
479-
480-
481446
InputStream src = TestResourceFinder.findTestResource("pqc/crypto/mldsa", "ML-DSA-sigVer.txt");
482447
BufferedReader bin = new BufferedReader(new InputStreamReader(src));
483448

@@ -501,7 +466,7 @@ public void testSigVerCombinedVectorSet()
501466
byte[] message = Hex.decode((String)buf.get("message"));
502467
byte[] signature = Hex.decode((String)buf.get("signature"));
503468

504-
MLDSAParameters parameters = parametersMap.get(buf.get("parameterSet"));
469+
MLDSAParameters parameters = parametersMap.get((String)buf.get("parameterSet"));
505470

506471
MLDSAPublicKeyParameters pubParams = new MLDSAPublicKeyParameters(parameters, pk);
507472

@@ -522,7 +487,6 @@ public void testSigVerCombinedVectorSet()
522487
buf.put(line.substring(0, a).trim(), line.substring(a + 1).trim());
523488
}
524489
}
525-
526490
}
527491

528492
private class InternalMLDSASigner

0 commit comments

Comments
 (0)