diff options
| author | J08nY | 2018-08-14 18:46:41 +0200 |
|---|---|---|
| committer | J08nY | 2018-08-14 19:01:12 +0200 |
| commit | c8a14bb85176b76ef817fea0002c0607f0f03d57 (patch) | |
| tree | 820aa310fef1d16b5c1638469bbe9a2d26be20be /src/cz/crcs/ectester/reader/test/CardEdgeCasesSuite.java | |
| parent | 8b60f1b6e4369b734818b415eac1373751170589 (diff) | |
| download | ECTester-c8a14bb85176b76ef817fea0002c0607f0f03d57.tar.gz ECTester-c8a14bb85176b76ef817fea0002c0607f0f03d57.tar.zst ECTester-c8a14bb85176b76ef817fea0002c0607f0f03d57.zip | |
Allow exporting set curve parameters to verify them.
Diffstat (limited to 'src/cz/crcs/ectester/reader/test/CardEdgeCasesSuite.java')
| -rw-r--r-- | src/cz/crcs/ectester/reader/test/CardEdgeCasesSuite.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/cz/crcs/ectester/reader/test/CardEdgeCasesSuite.java b/src/cz/crcs/ectester/reader/test/CardEdgeCasesSuite.java index f0dcaa0..5775a77 100644 --- a/src/cz/crcs/ectester/reader/test/CardEdgeCasesSuite.java +++ b/src/cz/crcs/ectester/reader/test/CardEdgeCasesSuite.java @@ -170,7 +170,12 @@ public class CardEdgeCasesSuite extends CardTestSuite { EC_Params krp1Params = makeParams(krp1); Test krp1S = ecdhTest(new Command.Set(this.card, ECTesterApplet.KEYPAIR_REMOTE, EC_Consts.CURVE_external, krp1Params.getParams(), krp1Params.flatten()), "ECDH with S = (k * r) + 1.", Result.ExpectedValue.FAILURE, Result.ExpectedValue.FAILURE); - doTest(CompoundTest.all(Result.ExpectedValue.SUCCESS, "Tests with edge-case private key values over " + curve.getId() + ".", setup, zeroS, oneS, smallerS, exactS, largerS, rm1S, rp1S, krS, krm1S, krp1S)); + if (cfg.cleanup) { + Test cleanup = CommandTest.expect(new Command.Cleanup(this.card), Result.ExpectedValue.ANY); + doTest(CompoundTest.all(Result.ExpectedValue.SUCCESS, "Tests with edge-case private key values over " + curve.getId() + ".", setup, zeroS, oneS, smallerS, exactS, largerS, rm1S, rp1S, krS, krm1S, krp1S, cleanup)); + } else { + doTest(CompoundTest.all(Result.ExpectedValue.SUCCESS, "Tests with edge-case private key values over " + curve.getId() + ".", setup, zeroS, oneS, smallerS, exactS, largerS, rm1S, rp1S, krS, krm1S, krp1S)); + } } } |