From 07cfc81f909ebeee6ea88a5671749bc44e5c6769 Mon Sep 17 00:00:00 2001
From: J08nY
Date: Thu, 28 Jun 2018 17:15:30 +0200
Subject: Add descriptions to composite curve data.
---
src/cz/crcs/ectester/data/composite/curves.xml | 87 +++++++++++++---------
.../ectester/reader/test/CardWrongCurvesSuite.java | 2 +-
2 files changed, 52 insertions(+), 37 deletions(-)
(limited to 'src')
diff --git a/src/cz/crcs/ectester/data/composite/curves.xml b/src/cz/crcs/ectester/data/composite/curves.xml
index 4d6a16a..a1abe2e 100644
--- a/src/cz/crcs/ectester/data/composite/curves.xml
+++ b/src/cz/crcs/ectester/data/composite/curves.xml
@@ -6,83 +6,98 @@
128
prime
composite128.csv
-
-
- small/composite128
- 128
- prime
- composite128_small.csv
+ r = order = 0x03 * 0x05 * 0x3b * 0x3a107e02cd073c8e24bf55730f1733
whole/composite160
160
prime
composite160.csv
-
-
- small/composite160
- 160
- prime
- composite160_small.csv
+ r = order = 0x02 * 0x03 * 0x6b * 0x1ee99b75143833bbc11d409601c25f9566a001
whole/composite192
192
prime
composite192.csv
-
-
- small/composite192
- 192
- prime
- composite192_small.csv
+ r = order = 0x02 * 0x03 * 0x05 * 0x13 * 0x19bc3c00e2a7ad9e40d12e5d9e29a2b5ce80b3a3e84295
whole/composite224
224
prime
composite224.csv
-
-
- small/composite224
- 224
- prime
- composite224_small.csv
+ r = order = 0x02 * 0x03 * 0x1d * 0x1538e6a6dc906d724a7bf51c77bce9d46865bd92d8bca01f887405
whole/composite256
256
prime
composite256.csv
-
-
- small/composite256
- 256
- prime
- composite256_small.csv
+ r = order = 0x02 * 0x05 * 0x11 * 0x1382cadcdd2b90b90b81eda82433bf574b5d8f5654dcc62341c7e967f2e811
whole/composite384
384
prime
composite384.csv
-
-
- small/composite384
- 384
- prime
- composite384_small.csv
+ r = order = 0x05 * 0x0b * 0x3d * 0xb16aa7dc50145337cf1b2f38018ccb5cf44c22a2f7d7c22bbe5c572d2cb9a04cb1081357c6a1c97cc39ab62596867
whole/composite521
521
prime
composite521.csv
+ r = order = 0x02 * 0x05 * 0x1f * 0x4a5aac4fac3ea253b66c3e650f5173b30467f28b8e841d37ce69bb0831a5939ad3dd082b750577ec4592d4d58916c87a9b732d8ddae435c26f8f779d2467f50f
+
+
+
+ small/composite128
+ 128
+ prime
+ composite128_small.csv
+ r = 0x03
+
+
+ small/composite160
+ 160
+ prime
+ composite160_small.csv
+ r = 0x03
+
+
+ small/composite192
+ 192
+ prime
+ composite192_small.csv
+ r = 0x03
+
+
+ small/composite224
+ 224
+ prime
+ composite224_small.csv
+ r = 0x03
+
+
+ small/composite256
+ 256
+ prime
+ composite256_small.csv
+ r = 0x05
+
+
+ small/composite384
+ 384
+ prime
+ composite384_small.csv
+ r = 0x05
small/composite521
521
prime
composite521_small.csv
+ r = 0x05
\ No newline at end of file
diff --git a/src/cz/crcs/ectester/reader/test/CardWrongCurvesSuite.java b/src/cz/crcs/ectester/reader/test/CardWrongCurvesSuite.java
index f95a386..8b648b9 100644
--- a/src/cz/crcs/ectester/reader/test/CardWrongCurvesSuite.java
+++ b/src/cz/crcs/ectester/reader/test/CardWrongCurvesSuite.java
@@ -111,8 +111,8 @@ public class CardWrongCurvesSuite extends CardTestSuite {
Test resetSetup = CompoundTest.all(ExpectedValue.SUCCESS, "Reset keypair.", set.clone());
- Test zeroG = ecdhTest(new Command.Transform(this.card, ECTesterApplet.KEYPAIR_BOTH, EC_Consts.KEY_BOTH, EC_Consts.PARAMETER_G, EC_Consts.TRANSFORMATION_INFINITY), "Set G = inifnity.", "ECDH with G = infinity.");
Test randomG = ecdhTest(new Command.Transform(this.card, ECTesterApplet.KEYPAIR_BOTH, EC_Consts.KEY_BOTH, EC_Consts.PARAMETER_G, (short) (EC_Consts.TRANSFORMATION_FULLRANDOM | EC_Consts.TRANSFORMATION_04_MASK)), "Set G = random non-point/point-like.", "ECDH with non-point G.");
+ Test zeroG = ecdhTest(new Command.Transform(this.card, ECTesterApplet.KEYPAIR_BOTH, EC_Consts.KEY_BOTH, EC_Consts.PARAMETER_G, EC_Consts.TRANSFORMATION_INFINITY), "Set G = inifnity.", "ECDH with G = infinity.");
Test wrongG = CompoundTest.all(ExpectedValue.SUCCESS, "Tests with corrupted G parameter.", zeroG, randomG);
byte[] originalR = new byte[keyLength];
--
cgit v1.2.3-70-g09d2