Fix test object overwriting in multiple repeats.

J08nY · J08nY · commit a3883795d126 · 2025-02-27T19:10:40.000+01:00
diff --git a/common/src/main/java/cz/crcs/ectester/common/test/CompoundTest.java b/common/src/main/java/cz/crcs/ectester/common/test/CompoundTest.java
@@ -225,6 +225,11 @@ public String getDescription() {
 
     @Override
     public CompoundTest clone() throws CloneNotSupportedException {
-        return (CompoundTest) super.clone();
+        CompoundTest clone = (CompoundTest) super.clone();
+        clone.tests = new Test[tests.length];
+        for (int i = 0; i < tests.length; i++) {
+            clone.tests[i] = tests[i].clone();
+        }
+        return clone;
     }
 }
diff --git a/reader/src/main/java/cz/crcs/ectester/reader/test/CardCofactorSuite.java b/reader/src/main/java/cz/crcs/ectester/reader/test/CardCofactorSuite.java
@@ -50,8 +50,9 @@ protected void runTests() throws Exception {
                 Test objectEcdh = CompoundTest.any(ExpectedValue.SUCCESS, CardUtil.getKATypeString(EC_Consts.KeyAgreement_ALG_EC_SVDP_DH) + " test with cofactor pubkey.", setPub, ecdh);
                 Command ecdhCommand = new Command.ECDH_direct(this.card, CardConsts.KEYPAIR_LOCAL, CardConsts.EXPORT_FALSE, EC_Consts.TRANSFORMATION_NONE, EC_Consts.KeyAgreement_ALG_EC_SVDP_DH, pub.flatten());
                 Test rawEcdh = CommandTest.expect(ecdhCommand, ExpectedValue.FAILURE, "Card correctly rejected point on non-generator subgroup.", "Card incorrectly accepted point on non-generator subgroup.");
+                Test test = CompoundTest.all(ExpectedValue.SUCCESS, pub.getId() + " cofactor key test.", objectEcdh, rawEcdh);
                 for (int i = 0; i < cfg.number; ++i) {
-                    ecdhTests.add(CompoundTest.all(ExpectedValue.SUCCESS, pub.getId() + " cofactor key test.", objectEcdh, rawEcdh));
+                    ecdhTests.add(test.clone());
                 }
             }
             if (cfg.testShuffle)
diff --git a/reader/src/main/java/cz/crcs/ectester/reader/test/CardCompositeSuite.java b/reader/src/main/java/cz/crcs/ectester/reader/test/CardCompositeSuite.java
@@ -45,8 +45,9 @@ protected void runTests() throws Exception {
             for (EC_Key key : curveKeys.getValue()) {
                 Command ecdhCommand = new Command.ECDH_direct(this.card, CardConsts.KEYPAIR_LOCAL, CardConsts.EXPORT_FALSE, EC_Consts.TRANSFORMATION_NONE, EC_Consts.KeyAgreement_ALG_EC_SVDP_DH, key.flatten());
                 Test ecdh = CommandTest.expect(ecdhCommand, ExpectedValue.FAILURE, "Card correctly rejected to do ECDH over a composite order curve.", "Card incorrectly does ECDH over a composite order curve, leaks bits of private key.");
+                Test test = CompoundTest.greedyAllTry(ExpectedValue.SUCCESS, "Composite test of " + curve.getId() + ", with " + key.getDesc(), ecdh);
                 for (int i = 0; i < cfg.number; ++i) {
-                    tests.add(CompoundTest.greedyAllTry(ExpectedValue.SUCCESS, "Composite test of " + curve.getId() + ", with " + key.getDesc(), ecdh));
+                    tests.add(test.clone());
                 }
             }
             if (cfg.testShuffle)
diff --git a/reader/src/main/java/cz/crcs/ectester/reader/test/CardDegenerateSuite.java b/reader/src/main/java/cz/crcs/ectester/reader/test/CardDegenerateSuite.java
@@ -50,8 +50,9 @@ protected void runTests() throws Exception {
                 Test objectEcdh = CompoundTest.any(Result.ExpectedValue.SUCCESS, CardUtil.getKATypeString(EC_Consts.KeyAgreement_ALG_EC_SVDP_DH) + " test with degenerate pubkey.", setPub, ecdh);
                 Command ecdhCommand = new Command.ECDH_direct(this.card, CardConsts.KEYPAIR_LOCAL, CardConsts.EXPORT_TRUE, EC_Consts.TRANSFORMATION_NONE, EC_Consts.KeyAgreement_ALG_EC_SVDP_DH, pub.flatten());
                 Test rawEcdh = CommandTest.expect(ecdhCommand, Result.ExpectedValue.FAILURE, "Card correctly rejected point on degenerate curve.", "Card incorrectly accepted point on degenerate curve.");
+                Test test = CompoundTest.all(Result.ExpectedValue.SUCCESS, pub.getId() + " degenerate key test.", objectEcdh, rawEcdh);
                 for (int i = 0; i < cfg.number; ++i) {
-                    ecdhTests.add(CompoundTest.all(Result.ExpectedValue.SUCCESS, pub.getId() + " degenerate key test.", objectEcdh, rawEcdh));
+                    ecdhTests.add(test.clone());
                 }
                 //TODO: actually get the result of ECDH here, as well as export privkey and compare to exponentiation in Fp^*.
             }
diff --git a/reader/src/main/java/cz/crcs/ectester/reader/test/CardEdgeCasesSuite.java b/reader/src/main/java/cz/crcs/ectester/reader/test/CardEdgeCasesSuite.java
@@ -98,7 +98,7 @@ public Result apply(CommandTestable testable) {
 
                     Test one = CompoundTest.greedyAllTry(Result.ExpectedValue.SUCCESS, "Test " + id + ".", prepare, ka);
                     for (int i = 0; i < cfg.number; ++i) {
-                        curveTests.add(one);
+                        curveTests.add(one.clone());
                     }
                 }
                 if (cfg.testShuffle)
@@ -235,7 +235,9 @@ public Result apply(CommandTestable testable) {
 
             List<Test> tests = new LinkedList<>();
             for (int i = 0; i < cfg.number; ++i) {
-                tests.addAll(Arrays.asList(zeroS, oneS, alternateS, alternateOtherS, fullS, smallerS, exactS, largerS, rm1S, rp1S, krS, krm1S, krp1S));
+                tests.addAll(Arrays.asList(zeroS.clone(), oneS.clone(), alternateS.clone(), alternateOtherS.clone(),
+                        fullS.clone(), smallerS.clone(), exactS.clone(), largerS.clone(), rm1S.clone(), rp1S.clone(),
+                        krS.clone(), krm1S.clone(), krp1S.clone()));
             }
             if (cfg.testShuffle)
                 Collections.shuffle(tests);
@@ -312,7 +314,7 @@ public Result apply(CommandTestable testable) {
 
         List<Test> tests160 = new LinkedList<>();
         for (int j = 0; j < cfg.number; ++j) {
-            tests160.addAll(Arrays.asList(zeroTest, pTest, rTest));
+            tests160.addAll(Arrays.asList(zeroTest.clone(), pTest.clone(), rTest.clone()));
         }
         if (cfg.testShuffle)
             Collections.shuffle(tests160);
diff --git a/reader/src/main/java/cz/crcs/ectester/reader/test/CardInvalidSuite.java b/reader/src/main/java/cz/crcs/ectester/reader/test/CardInvalidSuite.java
@@ -54,8 +54,9 @@ protected void runTests() throws Exception {
                 Test objectEcdh = CompoundTest.any(Result.ExpectedValue.SUCCESS, CardUtil.getKATypeString(EC_Consts.KeyAgreement_ALG_EC_SVDP_DH) + " test with invalid pubkey.", setPub, ecdh);
                 Command ecdhCommand = new Command.ECDH_direct(this.card, CardConsts.KEYPAIR_LOCAL, CardConsts.EXPORT_FALSE, EC_Consts.TRANSFORMATION_NONE, EC_Consts.KeyAgreement_ALG_EC_SVDP_DH, pub.flatten());
                 Test rawEcdh = CommandTest.expect(ecdhCommand, ExpectedValue.FAILURE, "Card correctly rejected point on invalid curve.", "Card incorrectly accepted point on invalid curve.");
+                Test test = CompoundTest.all(Result.ExpectedValue.SUCCESS, pub.getId() + " invalid key test.", objectEcdh, rawEcdh);
                 for (int i = 0; i < cfg.number; ++i) {
-                    ecdhTests.add(CompoundTest.all(Result.ExpectedValue.SUCCESS, pub.getId() + " invalid key test.", objectEcdh, rawEcdh));
+                    ecdhTests.add(test.clone());
                 }
             }
             if (cfg.testShuffle)
diff --git a/reader/src/main/java/cz/crcs/ectester/reader/test/CardTwistSuite.java b/reader/src/main/java/cz/crcs/ectester/reader/test/CardTwistSuite.java
@@ -48,8 +48,9 @@ protected void runTests() throws Exception {
                 Test objectEcdh = CompoundTest.any(Result.ExpectedValue.SUCCESS, CardUtil.getKATypeString(EC_Consts.KeyAgreement_ALG_EC_SVDP_DH) + " test with twist pubkey.", setPub, ecdh);
                 Command ecdhCommand = new Command.ECDH_direct(this.card, CardConsts.KEYPAIR_LOCAL, CardConsts.EXPORT_FALSE, EC_Consts.TRANSFORMATION_NONE, EC_Consts.KeyAgreement_ALG_EC_SVDP_DH, pub.flatten());
                 Test rawEcdh = CommandTest.expect(ecdhCommand, Result.ExpectedValue.FAILURE, "Card correctly rejected point on twist.", "Card incorrectly accepted point on twist.");
+                Test test =  CompoundTest.all(Result.ExpectedValue.SUCCESS, pub.getId() + " twist key test.", objectEcdh, rawEcdh);
                 for (int i = 0; i < cfg.number; ++i) {
-                    ecdhTests.add(CompoundTest.all(Result.ExpectedValue.SUCCESS, pub.getId() + " twist key test.", objectEcdh, rawEcdh));
+                    ecdhTests.add(test.clone());
                 }
             }
             if (cfg.testShuffle)
diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/test/suites/StandaloneCofactorSuite.java b/standalone/src/main/java/cz/crcs/ectester/standalone/test/suites/StandaloneCofactorSuite.java
@@ -71,8 +71,9 @@ protected void runTests() throws Exception {
                         Test keyAgreement = KeyAgreementTest.expectError(testable, Result.ExpectedValue.FAILURE);
                         specificKaTests.add(CompoundTest.all(Result.ExpectedValue.SUCCESS, pub.getId() + " cofactor key test (" + pub.getDesc() + ").", keyAgreement));
                     }
+                    Test test = CompoundTest.all(Result.ExpectedValue.SUCCESS, "Perform " + kaIdent.getName() + " with public points on non-generator subgroup.", specificKaTests.toArray(new Test[0]));
                     for (int i = 0; i < getNumRepeats(); i++) {
-                        allKaTests.add(CompoundTest.all(Result.ExpectedValue.SUCCESS, "Perform " + kaIdent.getName() + " with public points on non-generator subgroup.", specificKaTests.toArray(new Test[0])));
+                        allKaTests.add(test.clone());
                     }
                 }
             }
diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/test/suites/StandaloneCompositeSuite.java b/standalone/src/main/java/cz/crcs/ectester/standalone/test/suites/StandaloneCompositeSuite.java
@@ -75,8 +75,9 @@ protected void runTests() throws Exception {
                         Test keyAgreement = KeyAgreementTest.expectError(testable, Result.ExpectedValue.FAILURE);
                         specificKaTests.add(CompoundTest.all(Result.ExpectedValue.SUCCESS, "Composite test of " + curve.getId() + ", with generated private key, " + pub.getDesc(), keyAgreement));
                     }
+                    Test test = CompoundTest.all(Result.ExpectedValue.SUCCESS, "Perform " + kaIdent.getName() + " with various public points.", specificKaTests.toArray(new Test[0]));
                     for (int i = 0; i < getNumRepeats(); i++) {
-                        allKaTests.add(CompoundTest.all(Result.ExpectedValue.SUCCESS, "Perform " + kaIdent.getName() + " with various public points.", specificKaTests.toArray(new Test[0])));
+                        allKaTests.add(test.clone());
                     }
                 }
             }
diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/test/suites/StandaloneEdgeCasesSuite.java b/standalone/src/main/java/cz/crcs/ectester/standalone/test/suites/StandaloneEdgeCasesSuite.java
@@ -181,13 +181,14 @@ public Result apply(KeyAgreementTestable testable) {
 
             List<Test> tests = new LinkedList<>();
             for (int i = 0; i < getNumRepeats(); ++i) {
-                tests.addAll(Arrays.asList(zeroS, oneS, alternateS, alternateOtherS, fullS, smallerS, exactS, largerS, rm1S, rp1S, krS, krm1S, krp1S));
+                tests.addAll(Arrays.asList(zeroS.clone(), oneS.clone(), alternateS.clone(), alternateOtherS.clone(),
+                        fullS.clone(), smallerS.clone(), exactS.clone(), largerS.clone(), rm1S.clone(), rp1S.clone(),
+                        krS.clone(), krm1S.clone(), krp1S.clone()));
             }
             if (cli.hasOption("test.shuffle"))
                 Collections.shuffle(tests);
             tests.add(0, generate);
-            doTest(CompoundTest.function(CompoundTest.EXPECT_ALL_SUCCESS, CompoundTest.RUN_ALL_IF_FIRST, "Tests with edge-case private key values over " + curve.getId() + ".",
-                    generate, zeroS, oneS, alternateS, alternateOtherS, fullS, smallerS, exactS, largerS, rm1S, rp1S, krS, krm1S, krp1S));
+            doTest(CompoundTest.function(CompoundTest.EXPECT_ALL_SUCCESS, CompoundTest.RUN_ALL_IF_FIRST, "Tests with edge-case private key values over " + curve.getId() + ".", tests.toArray(new Test[0])));
         }
 
         EC_Curve secp160r1 = EC_Store.getInstance().getObject(EC_Curve.class, "secg/secp160r1");
@@ -251,7 +252,7 @@ public Result apply(KeyAgreementTestable testable) {
 
         List<Test> tests160 = new LinkedList<>();
         for (int j = 0; j < getNumRepeats(); ++j) {
-            tests160.addAll(Arrays.asList(zeroTest, pTest, rTest));
+            tests160.addAll(Arrays.asList(zeroTest.clone(), pTest.clone(), rTest.clone()));
         }
         if (cli.hasOption("test.shuffle"))
             Collections.shuffle(tests160);
diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/test/suites/StandaloneForeignSuite.java b/standalone/src/main/java/cz/crcs/ectester/standalone/test/suites/StandaloneForeignSuite.java
@@ -161,8 +161,9 @@ public int getKeysize() {
                         Test keyAgreement = KeyAgreementTest.expectError(testable, Result.ExpectedValue.FAILURE);
                         specificKaTests.add(CompoundTest.all(Result.ExpectedValue.SUCCESS, pub.getId() + " invalid key test.", keyAgreement));
                     }
+                    Test test = CompoundTest.all(Result.ExpectedValue.SUCCESS, "Perform " + kaIdent.getName() + " with invalid public points.", specificKaTests.toArray(new Test[0]));
                     for (int i = 0; i < getNumRepeats(); i++) {
-                        allKaTests.add(CompoundTest.all(Result.ExpectedValue.SUCCESS, "Perform " + kaIdent.getName() + " with invalid public points.", specificKaTests.toArray(new Test[0])));
+                        allKaTests.add(test.clone());
                     }
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -225,6 +225,11 @@ public String getDescription() {`
`225`	`225`
`226`	`226`	`@Override`
`227`	`227`	`public CompoundTest clone() throws CloneNotSupportedException {`
`228`		`- return (CompoundTest) super.clone();`
	`228`	`+ CompoundTest clone = (CompoundTest) super.clone();`
	`229`	`+ clone.tests = new Test[tests.length];`
	`230`	`+ for (int i = 0; i < tests.length; i++) {`
	`231`	`+ clone.tests[i] = tests[i].clone();`
	`232`	`+ }`
	`233`	`+ return clone;`
`229`	`234`	`}`
`230`	`235`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,8 +50,9 @@ protected void runTests() throws Exception {`
`50`	`50`	`Test objectEcdh = CompoundTest.any(ExpectedValue.SUCCESS, CardUtil.getKATypeString(EC_Consts.KeyAgreement_ALG_EC_SVDP_DH) + " test with cofactor pubkey.", setPub, ecdh);`
`51`	`51`	`Command ecdhCommand = new Command.ECDH_direct(this.card, CardConsts.KEYPAIR_LOCAL, CardConsts.EXPORT_FALSE, EC_Consts.TRANSFORMATION_NONE, EC_Consts.KeyAgreement_ALG_EC_SVDP_DH, pub.flatten());`
`52`	`52`	`Test rawEcdh = CommandTest.expect(ecdhCommand, ExpectedValue.FAILURE, "Card correctly rejected point on non-generator subgroup.", "Card incorrectly accepted point on non-generator subgroup.");`
	`53`	`+ Test test = CompoundTest.all(ExpectedValue.SUCCESS, pub.getId() + " cofactor key test.", objectEcdh, rawEcdh);`
`53`	`54`	`for (int i = 0; i < cfg.number; ++i) {`
`54`		`- ecdhTests.add(CompoundTest.all(ExpectedValue.SUCCESS, pub.getId() + " cofactor key test.", objectEcdh, rawEcdh));`
	`55`	`+ ecdhTests.add(test.clone());`
`55`	`56`	`}`
`56`	`57`	`}`
`57`	`58`	`if (cfg.testShuffle)`
Original file line number	Diff line number	Diff line change
`@@ -45,8 +45,9 @@ protected void runTests() throws Exception {`
`45`	`45`	`for (EC_Key key : curveKeys.getValue()) {`
`46`	`46`	`Command ecdhCommand = new Command.ECDH_direct(this.card, CardConsts.KEYPAIR_LOCAL, CardConsts.EXPORT_FALSE, EC_Consts.TRANSFORMATION_NONE, EC_Consts.KeyAgreement_ALG_EC_SVDP_DH, key.flatten());`
`47`	`47`	`Test ecdh = CommandTest.expect(ecdhCommand, ExpectedValue.FAILURE, "Card correctly rejected to do ECDH over a composite order curve.", "Card incorrectly does ECDH over a composite order curve, leaks bits of private key.");`
	`48`	`+ Test test = CompoundTest.greedyAllTry(ExpectedValue.SUCCESS, "Composite test of " + curve.getId() + ", with " + key.getDesc(), ecdh);`
`48`	`49`	`for (int i = 0; i < cfg.number; ++i) {`
`49`		`- tests.add(CompoundTest.greedyAllTry(ExpectedValue.SUCCESS, "Composite test of " + curve.getId() + ", with " + key.getDesc(), ecdh));`
	`50`	`+ tests.add(test.clone());`
`50`	`51`	`}`
`51`	`52`	`}`
`52`	`53`	`if (cfg.testShuffle)`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ public Result apply(CommandTestable testable) {`
`98`	`98`
`99`	`99`	`Test one = CompoundTest.greedyAllTry(Result.ExpectedValue.SUCCESS, "Test " + id + ".", prepare, ka);`
`100`	`100`	`for (int i = 0; i < cfg.number; ++i) {`
`101`		`- curveTests.add(one);`
	`101`	`+ curveTests.add(one.clone());`
`102`	`102`	`}`
`103`	`103`	`}`
`104`	`104`	`if (cfg.testShuffle)`
`@@ -235,7 +235,9 @@ public Result apply(CommandTestable testable) {`
`235`	`235`
`236`	`236`	`List<Test> tests = new LinkedList<>();`
`237`	`237`	`for (int i = 0; i < cfg.number; ++i) {`
`238`		`- tests.addAll(Arrays.asList(zeroS, oneS, alternateS, alternateOtherS, fullS, smallerS, exactS, largerS, rm1S, rp1S, krS, krm1S, krp1S));`
	`238`	`+ tests.addAll(Arrays.asList(zeroS.clone(), oneS.clone(), alternateS.clone(), alternateOtherS.clone(),`
	`239`	`+ fullS.clone(), smallerS.clone(), exactS.clone(), largerS.clone(), rm1S.clone(), rp1S.clone(),`
	`240`	`+ krS.clone(), krm1S.clone(), krp1S.clone()));`
`239`	`241`	`}`
`240`	`242`	`if (cfg.testShuffle)`
`241`	`243`	`Collections.shuffle(tests);`
`@@ -312,7 +314,7 @@ public Result apply(CommandTestable testable) {`
`312`	`314`
`313`	`315`	`List<Test> tests160 = new LinkedList<>();`
`314`	`316`	`for (int j = 0; j < cfg.number; ++j) {`
`315`		`- tests160.addAll(Arrays.asList(zeroTest, pTest, rTest));`
	`317`	`+ tests160.addAll(Arrays.asList(zeroTest.clone(), pTest.clone(), rTest.clone()));`
`316`	`318`	`}`
`317`	`319`	`if (cfg.testShuffle)`
`318`	`320`	`Collections.shuffle(tests160);`
Original file line number	Diff line number	Diff line change
`@@ -54,8 +54,9 @@ protected void runTests() throws Exception {`
`54`	`54`	`Test objectEcdh = CompoundTest.any(Result.ExpectedValue.SUCCESS, CardUtil.getKATypeString(EC_Consts.KeyAgreement_ALG_EC_SVDP_DH) + " test with invalid pubkey.", setPub, ecdh);`
`55`	`55`	`Command ecdhCommand = new Command.ECDH_direct(this.card, CardConsts.KEYPAIR_LOCAL, CardConsts.EXPORT_FALSE, EC_Consts.TRANSFORMATION_NONE, EC_Consts.KeyAgreement_ALG_EC_SVDP_DH, pub.flatten());`
`56`	`56`	`Test rawEcdh = CommandTest.expect(ecdhCommand, ExpectedValue.FAILURE, "Card correctly rejected point on invalid curve.", "Card incorrectly accepted point on invalid curve.");`
	`57`	`+ Test test = CompoundTest.all(Result.ExpectedValue.SUCCESS, pub.getId() + " invalid key test.", objectEcdh, rawEcdh);`
`57`	`58`	`for (int i = 0; i < cfg.number; ++i) {`
`58`		`- ecdhTests.add(CompoundTest.all(Result.ExpectedValue.SUCCESS, pub.getId() + " invalid key test.", objectEcdh, rawEcdh));`
	`59`	`+ ecdhTests.add(test.clone());`
`59`	`60`	`}`
`60`	`61`	`}`
`61`	`62`	`if (cfg.testShuffle)`
Original file line number	Diff line number	Diff line change
`@@ -48,8 +48,9 @@ protected void runTests() throws Exception {`
`48`	`48`	`Test objectEcdh = CompoundTest.any(Result.ExpectedValue.SUCCESS, CardUtil.getKATypeString(EC_Consts.KeyAgreement_ALG_EC_SVDP_DH) + " test with twist pubkey.", setPub, ecdh);`
`49`	`49`	`Command ecdhCommand = new Command.ECDH_direct(this.card, CardConsts.KEYPAIR_LOCAL, CardConsts.EXPORT_FALSE, EC_Consts.TRANSFORMATION_NONE, EC_Consts.KeyAgreement_ALG_EC_SVDP_DH, pub.flatten());`
`50`	`50`	`Test rawEcdh = CommandTest.expect(ecdhCommand, Result.ExpectedValue.FAILURE, "Card correctly rejected point on twist.", "Card incorrectly accepted point on twist.");`
	`51`	`+ Test test = CompoundTest.all(Result.ExpectedValue.SUCCESS, pub.getId() + " twist key test.", objectEcdh, rawEcdh);`
`51`	`52`	`for (int i = 0; i < cfg.number; ++i) {`
`52`		`- ecdhTests.add(CompoundTest.all(Result.ExpectedValue.SUCCESS, pub.getId() + " twist key test.", objectEcdh, rawEcdh));`
	`53`	`+ ecdhTests.add(test.clone());`
`53`	`54`	`}`
`54`	`55`	`}`
`55`	`56`	`if (cfg.testShuffle)`
Original file line number	Diff line number	Diff line change
`@@ -71,8 +71,9 @@ protected void runTests() throws Exception {`
`71`	`71`	`Test keyAgreement = KeyAgreementTest.expectError(testable, Result.ExpectedValue.FAILURE);`
`72`	`72`	`specificKaTests.add(CompoundTest.all(Result.ExpectedValue.SUCCESS, pub.getId() + " cofactor key test (" + pub.getDesc() + ").", keyAgreement));`
`73`	`73`	`}`
	`74`	`+ Test test = CompoundTest.all(Result.ExpectedValue.SUCCESS, "Perform " + kaIdent.getName() + " with public points on non-generator subgroup.", specificKaTests.toArray(new Test[0]));`
`74`	`75`	`for (int i = 0; i < getNumRepeats(); i++) {`
`75`		`- allKaTests.add(CompoundTest.all(Result.ExpectedValue.SUCCESS, "Perform " + kaIdent.getName() + " with public points on non-generator subgroup.", specificKaTests.toArray(new Test[0])));`
	`76`	`+ allKaTests.add(test.clone());`
`76`	`77`	`}`
`77`	`78`	`}`
`78`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -75,8 +75,9 @@ protected void runTests() throws Exception {`
`75`	`75`	`Test keyAgreement = KeyAgreementTest.expectError(testable, Result.ExpectedValue.FAILURE);`
`76`	`76`	`specificKaTests.add(CompoundTest.all(Result.ExpectedValue.SUCCESS, "Composite test of " + curve.getId() + ", with generated private key, " + pub.getDesc(), keyAgreement));`
`77`	`77`	`}`
	`78`	`+ Test test = CompoundTest.all(Result.ExpectedValue.SUCCESS, "Perform " + kaIdent.getName() + " with various public points.", specificKaTests.toArray(new Test[0]));`
`78`	`79`	`for (int i = 0; i < getNumRepeats(); i++) {`
`79`		`- allKaTests.add(CompoundTest.all(Result.ExpectedValue.SUCCESS, "Perform " + kaIdent.getName() + " with various public points.", specificKaTests.toArray(new Test[0])));`
	`80`	`+ allKaTests.add(test.clone());`
`80`	`81`	`}`
`81`	`82`	`}`
`82`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -161,8 +161,9 @@ public int getKeysize() {`
`161`	`161`	`Test keyAgreement = KeyAgreementTest.expectError(testable, Result.ExpectedValue.FAILURE);`
`162`	`162`	`specificKaTests.add(CompoundTest.all(Result.ExpectedValue.SUCCESS, pub.getId() + " invalid key test.", keyAgreement));`
`163`	`163`	`}`
	`164`	`+ Test test = CompoundTest.all(Result.ExpectedValue.SUCCESS, "Perform " + kaIdent.getName() + " with invalid public points.", specificKaTests.toArray(new Test[0]));`
`164`	`165`	`for (int i = 0; i < getNumRepeats(); i++) {`
`165`		`- allKaTests.add(CompoundTest.all(Result.ExpectedValue.SUCCESS, "Perform " + kaIdent.getName() + " with invalid public points.", specificKaTests.toArray(new Test[0])));`
	`166`	`+ allKaTests.add(test.clone());`
`166`	`167`	`}`
`167`	`168`	`}`
`168`	`169`	`}`