summaryrefslogtreecommitdiff
path: root/src/cz/crcs/ectester/reader/test/CardCofactorSuite.java
diff options
context:
space:
mode:
authorJ08nY2018-11-14 23:43:31 +0100
committerJ08nY2018-11-14 23:46:26 +0100
commit25bd6fd367c067f9311cb04d5acb703d1e0bccc6 (patch)
treef77acfedbbdb6fc8855029897c0b774c34e4d549 /src/cz/crcs/ectester/reader/test/CardCofactorSuite.java
parent53610f1ba50ac6bd80cc0789307bf577c04fdd58 (diff)
downloadECTester-25bd6fd367c067f9311cb04d5acb703d1e0bccc6.tar.gz
ECTester-25bd6fd367c067f9311cb04d5acb703d1e0bccc6.tar.zst
ECTester-25bd6fd367c067f9311cb04d5acb703d1e0bccc6.zip
Add ECDH validation tests using BouncyCastle.
Diffstat (limited to 'src/cz/crcs/ectester/reader/test/CardCofactorSuite.java')
-rw-r--r--src/cz/crcs/ectester/reader/test/CardCofactorSuite.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cz/crcs/ectester/reader/test/CardCofactorSuite.java b/src/cz/crcs/ectester/reader/test/CardCofactorSuite.java
index c8caa8b..172c8af 100644
--- a/src/cz/crcs/ectester/reader/test/CardCofactorSuite.java
+++ b/src/cz/crcs/ectester/reader/test/CardCofactorSuite.java
@@ -46,7 +46,7 @@ public class CardCofactorSuite extends CardTestSuite {
for (EC_Key.Public pub : keys) {
Test setPub = CommandTest.expect(new Command.Set(this.card, ECTesterApplet.KEYPAIR_REMOTE, EC_Consts.CURVE_external, pub.getParams(), pub.flatten()), Result.ExpectedValue.FAILURE);
Test ecdh = CommandTest.expect(new Command.ECDH(this.card, ECTesterApplet.KEYPAIR_REMOTE, ECTesterApplet.KEYPAIR_LOCAL, ECTesterApplet.EXPORT_FALSE, EC_Consts.TRANSFORMATION_NONE, EC_Consts.KeyAgreement_ALG_EC_SVDP_DH), Result.ExpectedValue.FAILURE);
- Test objectEcdh = CompoundTest.all(Result.ExpectedValue.SUCCESS, CardUtil.getKATypeString(EC_Consts.KeyAgreement_ALG_EC_SVDP_DH) + " test with degenerate pubkey.", setPub, ecdh);
+ 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, ECTesterApplet.KEYPAIR_LOCAL, ECTesterApplet.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.");
ecdhTests.add(CompoundTest.all(Result.ExpectedValue.SUCCESS, pub.getId() + " cofactor key test.", objectEcdh, rawEcdh));