From 8b932a878959d53fc449f22de406a9adc6d9edf0 Mon Sep 17 00:00:00 2001 From: J08nY Date: Wed, 4 Jul 2018 19:02:21 +0200 Subject: Also do composite tests with both keypairs generated on card. --- src/cz/crcs/ectester/reader/test/CardCompositeSuite.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/cz/crcs/ectester/reader/test/CardCompositeSuite.java b/src/cz/crcs/ectester/reader/test/CardCompositeSuite.java index 0d4d2e0..a693ac7 100644 --- a/src/cz/crcs/ectester/reader/test/CardCompositeSuite.java +++ b/src/cz/crcs/ectester/reader/test/CardCompositeSuite.java @@ -59,10 +59,16 @@ public class CardCompositeSuite extends CardTestSuite { new Command.Cleanup(this.card).send(); } - /* Also test having a G of small order, so small R. - */ + Map results = EC_Store.getInstance().getObjects(EC_Curve.class, "composite"); List>> groupList = EC_Store.mapToPrefix(results.values()); + /* Test the whole curves with both keypairs generated on card(no small-order public points provided). + */ + List wholeCurves = groupList.stream().filter((e) -> e.getKey().equals("whole")).findFirst().get().getValue(); + testGroup(wholeCurves, "Composite generator order", ExpectedValue.FAILURE, "Card rejected to do ECDH with composite order generator.", "Card did not reject to do ECDH with composite order generator."); + + /* Also test having a G of small order, so small R. + */ List smallRCurves = groupList.stream().filter((e) -> e.getKey().equals("small")).findFirst().get().getValue(); testGroup(smallRCurves, "Small generator order", ExpectedValue.FAILURE, "Card correctly rejected to do ECDH over a small order generator.", "Card incorrectly does ECDH over a small order generator."); -- cgit v1.2.3-70-g09d2