From 01d3f6474462955ebf14cd7ba71a430eef54d095 Mon Sep 17 00:00:00 2001 From: J08nY Date: Tue, 3 Jul 2018 20:20:59 +0200 Subject: Rename and reorder tests. --- src/cz/crcs/ectester/common/ec/EC_Data.java | 2 + .../ectester/common/output/BaseTextTestWriter.java | 3 +- src/cz/crcs/ectester/data/EC_Store.java | 9 +- .../crcs/ectester/data/cofactor/cofactor128p16.csv | 1 + .../crcs/ectester/data/cofactor/cofactor128p2.csv | 1 + .../crcs/ectester/data/cofactor/cofactor128p32.csv | 1 + .../crcs/ectester/data/cofactor/cofactor128p4.csv | 1 + .../crcs/ectester/data/cofactor/cofactor128p64.csv | 1 + .../crcs/ectester/data/cofactor/cofactor128p8.csv | 1 + .../ectester/data/cofactor/cofactor128t163.csv | 1 - .../ectester/data/cofactor/cofactor128t233.csv | 1 - .../crcs/ectester/data/cofactor/cofactor160p16.csv | 1 + .../crcs/ectester/data/cofactor/cofactor160p2.csv | 1 + .../crcs/ectester/data/cofactor/cofactor160p32.csv | 1 + .../crcs/ectester/data/cofactor/cofactor160p4.csv | 1 + .../crcs/ectester/data/cofactor/cofactor160p64.csv | 1 + .../crcs/ectester/data/cofactor/cofactor160p8.csv | 1 + .../ectester/data/cofactor/cofactor163t128.csv | 1 + .../crcs/ectester/data/cofactor/cofactor163t16.csv | 1 + .../crcs/ectester/data/cofactor/cofactor163t2.csv | 1 + .../crcs/ectester/data/cofactor/cofactor163t32.csv | 1 + .../crcs/ectester/data/cofactor/cofactor163t4.csv | 1 + .../crcs/ectester/data/cofactor/cofactor163t64.csv | 1 + .../crcs/ectester/data/cofactor/cofactor163t8.csv | 1 + .../crcs/ectester/data/cofactor/cofactor16p128.csv | 1 - .../crcs/ectester/data/cofactor/cofactor16p160.csv | 1 - .../crcs/ectester/data/cofactor/cofactor16t163.csv | 1 - .../crcs/ectester/data/cofactor/cofactor16t233.csv | 1 - .../ectester/data/cofactor/cofactor233t128.csv | 1 + .../crcs/ectester/data/cofactor/cofactor233t16.csv | 1 + .../crcs/ectester/data/cofactor/cofactor233t2.csv | 1 + .../crcs/ectester/data/cofactor/cofactor233t32.csv | 1 + .../crcs/ectester/data/cofactor/cofactor233t4.csv | 1 + .../crcs/ectester/data/cofactor/cofactor233t64.csv | 1 + .../crcs/ectester/data/cofactor/cofactor233t8.csv | 1 + .../crcs/ectester/data/cofactor/cofactor2p128.csv | 1 - .../crcs/ectester/data/cofactor/cofactor2p160.csv | 1 - .../crcs/ectester/data/cofactor/cofactor2t163.csv | 1 - .../crcs/ectester/data/cofactor/cofactor2t233.csv | 1 - .../crcs/ectester/data/cofactor/cofactor32p128.csv | 1 - .../crcs/ectester/data/cofactor/cofactor32p160.csv | 1 - .../crcs/ectester/data/cofactor/cofactor32t163.csv | 1 - .../crcs/ectester/data/cofactor/cofactor32t233.csv | 1 - .../crcs/ectester/data/cofactor/cofactor4p128.csv | 1 - .../crcs/ectester/data/cofactor/cofactor4p160.csv | 1 - .../crcs/ectester/data/cofactor/cofactor4t163.csv | 1 - .../crcs/ectester/data/cofactor/cofactor4t233.csv | 1 - .../crcs/ectester/data/cofactor/cofactor64p128.csv | 1 - .../crcs/ectester/data/cofactor/cofactor64p160.csv | 1 - .../crcs/ectester/data/cofactor/cofactor64t163.csv | 1 - .../crcs/ectester/data/cofactor/cofactor64t233.csv | 1 - .../crcs/ectester/data/cofactor/cofactor8p128.csv | 1 - .../crcs/ectester/data/cofactor/cofactor8p160.csv | 1 - .../crcs/ectester/data/cofactor/cofactor8t163.csv | 1 - .../crcs/ectester/data/cofactor/cofactor8t233.csv | 1 - src/cz/crcs/ectester/data/cofactor/curves.xml | 104 ++-- src/cz/crcs/ectester/data/cofactor/keys.xml | 658 ++++++++++++++++++--- .../ectester/data/composite/composite256_pq1.csv | 2 +- .../ectester/data/composite/composite256_pq2.csv | 2 +- src/cz/crcs/ectester/reader/ECTesterReader.java | 1 + .../ectester/reader/test/CardCofactorSuite.java | 8 +- 61 files changed, 671 insertions(+), 170 deletions(-) create mode 100644 src/cz/crcs/ectester/data/cofactor/cofactor128p16.csv create mode 100644 src/cz/crcs/ectester/data/cofactor/cofactor128p2.csv create mode 100644 src/cz/crcs/ectester/data/cofactor/cofactor128p32.csv create mode 100644 src/cz/crcs/ectester/data/cofactor/cofactor128p4.csv create mode 100644 src/cz/crcs/ectester/data/cofactor/cofactor128p64.csv create mode 100644 src/cz/crcs/ectester/data/cofactor/cofactor128p8.csv delete mode 100644 src/cz/crcs/ectester/data/cofactor/cofactor128t163.csv delete mode 100644 src/cz/crcs/ectester/data/cofactor/cofactor128t233.csv create mode 100644 src/cz/crcs/ectester/data/cofactor/cofactor160p16.csv create mode 100644 src/cz/crcs/ectester/data/cofactor/cofactor160p2.csv create mode 100644 src/cz/crcs/ectester/data/cofactor/cofactor160p32.csv create mode 100644 src/cz/crcs/ectester/data/cofactor/cofactor160p4.csv create mode 100644 src/cz/crcs/ectester/data/cofactor/cofactor160p64.csv create mode 100644 src/cz/crcs/ectester/data/cofactor/cofactor160p8.csv create mode 100644 src/cz/crcs/ectester/data/cofactor/cofactor163t128.csv create mode 100644 src/cz/crcs/ectester/data/cofactor/cofactor163t16.csv create mode 100644 src/cz/crcs/ectester/data/cofactor/cofactor163t2.csv create mode 100644 src/cz/crcs/ectester/data/cofactor/cofactor163t32.csv create mode 100644 src/cz/crcs/ectester/data/cofactor/cofactor163t4.csv create mode 100644 src/cz/crcs/ectester/data/cofactor/cofactor163t64.csv create mode 100644 src/cz/crcs/ectester/data/cofactor/cofactor163t8.csv delete mode 100644 src/cz/crcs/ectester/data/cofactor/cofactor16p128.csv delete mode 100644 src/cz/crcs/ectester/data/cofactor/cofactor16p160.csv delete mode 100644 src/cz/crcs/ectester/data/cofactor/cofactor16t163.csv delete mode 100644 src/cz/crcs/ectester/data/cofactor/cofactor16t233.csv create mode 100644 src/cz/crcs/ectester/data/cofactor/cofactor233t128.csv create mode 100644 src/cz/crcs/ectester/data/cofactor/cofactor233t16.csv create mode 100644 src/cz/crcs/ectester/data/cofactor/cofactor233t2.csv create mode 100644 src/cz/crcs/ectester/data/cofactor/cofactor233t32.csv create mode 100644 src/cz/crcs/ectester/data/cofactor/cofactor233t4.csv create mode 100644 src/cz/crcs/ectester/data/cofactor/cofactor233t64.csv create mode 100644 src/cz/crcs/ectester/data/cofactor/cofactor233t8.csv delete mode 100644 src/cz/crcs/ectester/data/cofactor/cofactor2p128.csv delete mode 100644 src/cz/crcs/ectester/data/cofactor/cofactor2p160.csv delete mode 100644 src/cz/crcs/ectester/data/cofactor/cofactor2t163.csv delete mode 100644 src/cz/crcs/ectester/data/cofactor/cofactor2t233.csv delete mode 100644 src/cz/crcs/ectester/data/cofactor/cofactor32p128.csv delete mode 100644 src/cz/crcs/ectester/data/cofactor/cofactor32p160.csv delete mode 100644 src/cz/crcs/ectester/data/cofactor/cofactor32t163.csv delete mode 100644 src/cz/crcs/ectester/data/cofactor/cofactor32t233.csv delete mode 100644 src/cz/crcs/ectester/data/cofactor/cofactor4p128.csv delete mode 100644 src/cz/crcs/ectester/data/cofactor/cofactor4p160.csv delete mode 100644 src/cz/crcs/ectester/data/cofactor/cofactor4t163.csv delete mode 100644 src/cz/crcs/ectester/data/cofactor/cofactor4t233.csv delete mode 100644 src/cz/crcs/ectester/data/cofactor/cofactor64p128.csv delete mode 100644 src/cz/crcs/ectester/data/cofactor/cofactor64p160.csv delete mode 100644 src/cz/crcs/ectester/data/cofactor/cofactor64t163.csv delete mode 100644 src/cz/crcs/ectester/data/cofactor/cofactor64t233.csv delete mode 100644 src/cz/crcs/ectester/data/cofactor/cofactor8p128.csv delete mode 100644 src/cz/crcs/ectester/data/cofactor/cofactor8p160.csv delete mode 100644 src/cz/crcs/ectester/data/cofactor/cofactor8t163.csv delete mode 100644 src/cz/crcs/ectester/data/cofactor/cofactor8t233.csv (limited to 'src') diff --git a/src/cz/crcs/ectester/common/ec/EC_Data.java b/src/cz/crcs/ectester/common/ec/EC_Data.java index 1b81eae..abe6e93 100644 --- a/src/cz/crcs/ectester/common/ec/EC_Data.java +++ b/src/cz/crcs/ectester/common/ec/EC_Data.java @@ -219,6 +219,7 @@ public abstract class EC_Data implements Comparable { public int compareTo(EC_Data o) { if (o == this) return 0; if (this.id != null && o.id != null) { + int minLength = Math.min(this.id.length(), o.id.length()); for (int i = 0; i < minLength; i++) { if (this.id.charAt(i) != o.id.charAt(i)) { @@ -229,6 +230,7 @@ public abstract class EC_Data implements Comparable { int oIndex = Integer.parseInt(oEnd); return Integer.compare(thisIndex, oIndex); } catch (NumberFormatException ignored) { + break; } } } diff --git a/src/cz/crcs/ectester/common/output/BaseTextTestWriter.java b/src/cz/crcs/ectester/common/output/BaseTextTestWriter.java index 8502704..c3ce640 100644 --- a/src/cz/crcs/ectester/common/output/BaseTextTestWriter.java +++ b/src/cz/crcs/ectester/common/output/BaseTextTestWriter.java @@ -27,7 +27,7 @@ public abstract class BaseTextTestWriter implements TestWriter { @Override public void begin(TestSuite suite) { - output.println("═══ Running test suite: " + suite.getName() + " ═══"); + output.println("═══ Running test suite: " + Colors.bold(suite.getName()) + " ═══"); for (String d : suite.getDescription()) { output.println("═══ " + d); } @@ -113,6 +113,7 @@ public abstract class BaseTextTestWriter implements TestWriter { sb.append("═══ ").append(t.toString()).append(" ═══"); sb.append(System.lineSeparator()); } + sb.append("═══ ═══").append(System.lineSeparator()); for (StackTraceElement s : error.getStackTrace()) { sb.append("═══ ").append(s.toString()).append(" ═══"); sb.append(System.lineSeparator()); diff --git a/src/cz/crcs/ectester/data/EC_Store.java b/src/cz/crcs/ectester/data/EC_Store.java index b962f23..cb65402 100644 --- a/src/cz/crcs/ectester/data/EC_Store.java +++ b/src/cz/crcs/ectester/data/EC_Store.java @@ -153,7 +153,7 @@ public class EC_Store { InputStream csv = parseDataElement(dir, curveElem); if (!curve.readCSV(csv)) { - throw new IOException("Invalid csv data."); + throw new IOException("Invalid csv data." + id.getTextContent()); } csv.close(); @@ -219,7 +219,7 @@ public class EC_Store { InputStream csv = parseDataElement(dir, elem); if (!kaResult.readCSV(csv)) { - throw new IOException("Invalid csv data."); + throw new IOException("Invalid csv data. " + id.getTextContent()); } csv.close(); @@ -257,7 +257,7 @@ public class EC_Store { InputStream csv = parseDataElement(dir, elem); if (!result.readCSV(csv)) { - throw new IOException("Invalid CSV data."); + throw new IOException("Invalid CSV data. " + id.getTextContent()); } csv.close(); @@ -332,8 +332,7 @@ public class EC_Store { } List>> curveList = new LinkedList<>(); curveList.addAll(curves.entrySet()); - Comparator>> c = Comparator.comparing(o -> o.getKey().getId()); - curveList.sort(c.thenComparing(b -> b.getKey().getBits())); + Comparator>> c = Comparator.comparing(Map.Entry::getKey); return curveList; } diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor128p16.csv b/src/cz/crcs/ectester/data/cofactor/cofactor128p16.csv new file mode 100644 index 0000000..181c47c --- /dev/null +++ b/src/cz/crcs/ectester/data/cofactor/cofactor128p16.csv @@ -0,0 +1 @@ +0xf723fda094465e1328ca65dfe04ae01b,0x5c1145c56795ae08d3f96d7451db5389,0x3eafb22339feab41ab6069ec1188ea7d,0x6ec8bbabff3e264c59d152c03a29fb26,0x8c8e8e721c8817528cd243667d023095,0xf723fda094465e13cb5a5cc981c945f,0x10 \ No newline at end of file diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor128p2.csv b/src/cz/crcs/ectester/data/cofactor/cofactor128p2.csv new file mode 100644 index 0000000..d9857d8 --- /dev/null +++ b/src/cz/crcs/ectester/data/cofactor/cofactor128p2.csv @@ -0,0 +1 @@ +0xf07c2775c51f358b8bdab54821aaa5ab,0x54e4afb6f93de32081be13f858262bc7,0xe13c739a7fe7f62812babb3cba8c6b1f,0x43cefc1ddc7d6936b0db49ecb4b8c4d9,0x52579151eb2779295b75cd7226895abb,0x783e13bae28f9ac60c18591fe953fbf7,0x2 \ No newline at end of file diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor128p32.csv b/src/cz/crcs/ectester/data/cofactor/cofactor128p32.csv new file mode 100644 index 0000000..9673835 --- /dev/null +++ b/src/cz/crcs/ectester/data/cofactor/cofactor128p32.csv @@ -0,0 +1 @@ +0x8d4ee802a67d0de73b9ec4f1a70227b7,0x70b4c15289f93fbc9247509fc9085396,0x04dfb7818caa18da2a60b50f0056a62b,0x09907655c9579e02b30534529dc0031a,0x365f28ab09d64508b47519fea58f4035,0x46a77401533e86f405231d0d851b3d9,0x20 \ No newline at end of file diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor128p4.csv b/src/cz/crcs/ectester/data/cofactor/cofactor128p4.csv new file mode 100644 index 0000000..44363ad --- /dev/null +++ b/src/cz/crcs/ectester/data/cofactor/cofactor128p4.csv @@ -0,0 +1 @@ +0x94d9020b666fbb599609485472a9246f,0x8220ebe30c27e10f945b0c2cdfe6dcaa,0x1914928b1a349161061165128629ea88,0x6a1a526fe3d4f719082872b2d149a90f,0x423351dae6533a1a916b151cd0783165,0x25364082d99beed620f8082db41374e7,0x4 \ No newline at end of file diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor128p64.csv b/src/cz/crcs/ectester/data/cofactor/cofactor128p64.csv new file mode 100644 index 0000000..35a5ecc --- /dev/null +++ b/src/cz/crcs/ectester/data/cofactor/cofactor128p64.csv @@ -0,0 +1 @@ +0xc3d6db041a0c509309d706a52a9ae20d,0x6234008af9a67b1a0cf123a38a46d0fb,0x65ca327cc79249fd9b4f3a1c15890787,0x57c0a37da59815687f752f724f015b21,0x9136e347e107c2f5face9abd739f6a82,0x30f5b6c1068314251fbe0d341f0c569,0x40 \ No newline at end of file diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor128p8.csv b/src/cz/crcs/ectester/data/cofactor/cofactor128p8.csv new file mode 100644 index 0000000..94d4b4e --- /dev/null +++ b/src/cz/crcs/ectester/data/cofactor/cofactor128p8.csv @@ -0,0 +1 @@ +0xe65f3e99554260c832ee6c21ec3ac437,0x0ff5c77f9c00ad42c58878e9510a059e,0x0652b998c3bfeefe20afc97a2b6595f4,0xc8a6fef9cbda700c097a1c3ddcaf3d0d,0x602bc0de98577bf266432e60fabe4946,0x1ccbe7d32aa84c191817ef7e51812989,0x8 \ No newline at end of file diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor128t163.csv b/src/cz/crcs/ectester/data/cofactor/cofactor128t163.csv deleted file mode 100644 index c748587..0000000 --- a/src/cz/crcs/ectester/data/cofactor/cofactor128t163.csv +++ /dev/null @@ -1 +0,0 @@ -0xa3,0x8,0x2,0x1,0x02391521a0d15b5eee4cae4cb3628d79479cb15700,0x004095708f687ea59f768ee27e167117b9401c223e,0x01925be8ca3bbee060bd2041c5fe0652be1f2d8942,0x024e103317a95c4d6c5b731c67d87688dd15a3cf7d,0x1000000000000000000001b01bb79598eedfebcf,0x80 diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor128t233.csv b/src/cz/crcs/ectester/data/cofactor/cofactor128t233.csv deleted file mode 100644 index 48505d4..0000000 --- a/src/cz/crcs/ectester/data/cofactor/cofactor128t233.csv +++ /dev/null @@ -1 +0,0 @@ -0xe9,0x4a,0x0,0x0,0x010ce87b92d6866c18d14efba7025388574f670476169b09929bbe2b7a4a,0x001ab1f0aecfe5ee45923aad73ea5fa24b554f91ff41a8fd5529d55e76f8,0x009d7d0edc1868aa15931051f8b084e25e8b0f2098994483cab3737c021e,0x01f663c194c41dd386976d105acd3be135ceb5f0d69f932565bc4706e2a9,0x3ffffffffffffffffffffffffffffd7489d946218417d25b50e07c781,0x80 \ No newline at end of file diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor160p16.csv b/src/cz/crcs/ectester/data/cofactor/cofactor160p16.csv new file mode 100644 index 0000000..4d82274 --- /dev/null +++ b/src/cz/crcs/ectester/data/cofactor/cofactor160p16.csv @@ -0,0 +1 @@ +0x85836f09b17d1ec0cdeda21b55485e18dd968323,0x5480f9557c649a8e30f1e1256d07b0e32483ac68,0x0ecd880812f41c97be8b5daf1865725753b2ba37,0x16e1dd32469e75aa72a1dc48b78587b18e4f9874,0x70920054032065a09fad53a3ca69de634634a421,0x85836f09b17d1ec0cdecfe96b46937bbf135dab,0x10 \ No newline at end of file diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor160p2.csv b/src/cz/crcs/ectester/data/cofactor/cofactor160p2.csv new file mode 100644 index 0000000..54717af --- /dev/null +++ b/src/cz/crcs/ectester/data/cofactor/cofactor160p2.csv @@ -0,0 +1 @@ +0xd3622579d76435736f05756763249bb0facdc4a3,0xa645cc4161eb7cd8839b6e26c3efb6734b5bdc65,0xb1900e655c426daea7b80fecdd77ba19a9bb473c,0x2cfbf234e0d99ce44fdaedd2ec2e01558e6d7fd7,0x1495986fef15ada29c39866ac03ddc934589dffc,0x69b112bcebb21ab9b782a0dac36ea8fa7be5fd1b,0x2 \ No newline at end of file diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor160p32.csv b/src/cz/crcs/ectester/data/cofactor/cofactor160p32.csv new file mode 100644 index 0000000..75238ea --- /dev/null +++ b/src/cz/crcs/ectester/data/cofactor/cofactor160p32.csv @@ -0,0 +1 @@ +0x91634da0ec681dd6ba65beaf596d82b262b4cded,0x747c9302638253325e847cb5f0cf71134e672ec5,0x68ac504eba7a475a52b2bff92b5b77fb16f124b8,0x721dbbff58bc41dff64da7bd7a45d9892f659306,0x6d353cfdf9570402ccd11b9651a2d4be5d4f1853,0x48b1a6d076340eeb5d33371825941b3e0012e99,0x20 \ No newline at end of file diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor160p4.csv b/src/cz/crcs/ectester/data/cofactor/cofactor160p4.csv new file mode 100644 index 0000000..760dbef --- /dev/null +++ b/src/cz/crcs/ectester/data/cofactor/cofactor160p4.csv @@ -0,0 +1 @@ +0x93ab454ad26dae3b521d5b61a48c94cab3c4aa9d,0x4b2d384edb6b10bdaf4c608cc5aff078c4c58e38,0x35bc442cc9f7fe4317cf36d4f411c98f26956527,0x216d191d642aab59fca4ec18b95e11a298da5a00,0x09d9b5f44253719aeb44d3986c40ee3d9c9d86c9,0x24ead152b49b6b8ed4874ccca8f78da90add8ceb,0x4 \ No newline at end of file diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor160p64.csv b/src/cz/crcs/ectester/data/cofactor/cofactor160p64.csv new file mode 100644 index 0000000..4cdcfdc --- /dev/null +++ b/src/cz/crcs/ectester/data/cofactor/cofactor160p64.csv @@ -0,0 +1 @@ +0xfe2a2fe87bef6a429245c029cf205f06e16cd249,0xc42dc19e1c0c0b0dd27758d2787d526b25ad89b5,0xf72edb299fab1b613708d4165ededab65350fe6c,0x104a825944921b469704babb2727e5f8a829f2e1,0x8b955a5059e68cc0e932bbdb90fe81730c8e4d19,0x3f8a8bfa1efbda90a4917c6c340f970a5fce9c3,0x40 \ No newline at end of file diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor160p8.csv b/src/cz/crcs/ectester/data/cofactor/cofactor160p8.csv new file mode 100644 index 0000000..60ca98e --- /dev/null +++ b/src/cz/crcs/ectester/data/cofactor/cofactor160p8.csv @@ -0,0 +1 @@ +0xe40476bfeb2a3fd21ad80c102aad29f61cec5eaf,0x544ccbf7202e6b6d27fc19a3587eecc4ec665430,0x86690f7849e1707b28c24b718e7ffa36b55677b5,0x836cee7bcecb29d171c4bd9a1b4943e8159e4708,0xa0add6ab4a0729fd2719e5767abfc4d4c49ff802,0x1c808ed7fd6547fa435b03ffd3b931cccc8c098f,0x8 \ No newline at end of file diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor163t128.csv b/src/cz/crcs/ectester/data/cofactor/cofactor163t128.csv new file mode 100644 index 0000000..c748587 --- /dev/null +++ b/src/cz/crcs/ectester/data/cofactor/cofactor163t128.csv @@ -0,0 +1 @@ +0xa3,0x8,0x2,0x1,0x02391521a0d15b5eee4cae4cb3628d79479cb15700,0x004095708f687ea59f768ee27e167117b9401c223e,0x01925be8ca3bbee060bd2041c5fe0652be1f2d8942,0x024e103317a95c4d6c5b731c67d87688dd15a3cf7d,0x1000000000000000000001b01bb79598eedfebcf,0x80 diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor163t16.csv b/src/cz/crcs/ectester/data/cofactor/cofactor163t16.csv new file mode 100644 index 0000000..decdad3 --- /dev/null +++ b/src/cz/crcs/ectester/data/cofactor/cofactor163t16.csv @@ -0,0 +1 @@ +0xa3,0x8,0x2,0x1,0x0574f63f2c0fc757663ccda72b2ec8a37e7c84dfbc,0x03816a247d9618c4d1431793a2b9aaa8c5235ba047,0x074e2cfe3199fe1d5fb2cd8cc2e9aa8bf82ec4e90a,0x02942efd0f0619aaabd77de3f48da81138ab6dccc6,0x7fffffffffffffffffffbd3a47e6e6c2e2d09335,0x10 diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor163t2.csv b/src/cz/crcs/ectester/data/cofactor/cofactor163t2.csv new file mode 100644 index 0000000..d837a28 --- /dev/null +++ b/src/cz/crcs/ectester/data/cofactor/cofactor163t2.csv @@ -0,0 +1 @@ +0xa3,0x8,0x2,0x1,0x020e850e21d5bfce24ff184c220ea69b20bad05c65,0x0547b079a38b6094672f6cb5adefa94ba1a29d977b,0x0156bee74ac2552ee999cff24e1d7c471ffc17d0c7,0x04a955c7e3b3534d9fd168d9fbffea3acca23c1fdd,0x400000000000000000001e699c7714c35b242f43b,0x2 \ No newline at end of file diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor163t32.csv b/src/cz/crcs/ectester/data/cofactor/cofactor163t32.csv new file mode 100644 index 0000000..2b88982 --- /dev/null +++ b/src/cz/crcs/ectester/data/cofactor/cofactor163t32.csv @@ -0,0 +1 @@ +0xa3,0x8,0x2,0x1,0x04a4e7bb96ff9007b4be8097c5c4e36701e3f22aa8,0x020d55ea20c74a09f86cc1b2ecf2d073f46ad9b7fa,0x05f7347502518870fc7419e2d0e3170d5b04333a48,0x05951c6d70c789d60bd25b2519416dc756da26d320,0x3fffffffffffffffffffe88d1f6ec2029eaf4f9d,0x20 diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor163t4.csv b/src/cz/crcs/ectester/data/cofactor/cofactor163t4.csv new file mode 100644 index 0000000..61f7b03 --- /dev/null +++ b/src/cz/crcs/ectester/data/cofactor/cofactor163t4.csv @@ -0,0 +1 @@ +0xa3,0x8,0x2,0x1,0x027b506a68264c13994a74473ebd0506ce33921b00,0x0483681d34fdc0544a690cd8363ef6876bc9df5b09,0x051d0095b0d49e8b9b2e38a49ab58abb28b8301349,0x0427559b4db514f0659cbc45a1a785ff3c32f0d0c5,0x1fffffffffffffffffffff89941a8461c966379ad,0x4 \ No newline at end of file diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor163t64.csv b/src/cz/crcs/ectester/data/cofactor/cofactor163t64.csv new file mode 100644 index 0000000..6d3ee91 --- /dev/null +++ b/src/cz/crcs/ectester/data/cofactor/cofactor163t64.csv @@ -0,0 +1 @@ +0xa3,0x8,0x2,0x1,0x041a27de41f0e09c7cd4ff65fe10d472c9ca652ea1,0x00b27568b80c64d610ffdde6b3f520df0e0c499aa8,0x04f3cce508325c822a5e04044014d785e9b55ef95e,0x010021cb58589ea7cc7a8caea926276eb32db24b45,0x1ffffffffffffffffffff192d95b4d882a5ee3b9,0x40 diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor163t8.csv b/src/cz/crcs/ectester/data/cofactor/cofactor163t8.csv new file mode 100644 index 0000000..349e874 --- /dev/null +++ b/src/cz/crcs/ectester/data/cofactor/cofactor163t8.csv @@ -0,0 +1 @@ +0xa3,0x8,0x2,0x1,0x0183b7c0268ef09222560b602c9444aeb218a9b1c8,0x0035948fa062ffab3e7e63de769fec1407c6b85c6c,0x04d3aaef5f5075d1bbf92e9a5393af45b6946e2074,0x041df30932c95f4732fd59593e11aef8bb46ef3b6c,0x100000000000000000000762c81022ff40e2843f1,0x8 \ No newline at end of file diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor16p128.csv b/src/cz/crcs/ectester/data/cofactor/cofactor16p128.csv deleted file mode 100644 index 181c47c..0000000 --- a/src/cz/crcs/ectester/data/cofactor/cofactor16p128.csv +++ /dev/null @@ -1 +0,0 @@ -0xf723fda094465e1328ca65dfe04ae01b,0x5c1145c56795ae08d3f96d7451db5389,0x3eafb22339feab41ab6069ec1188ea7d,0x6ec8bbabff3e264c59d152c03a29fb26,0x8c8e8e721c8817528cd243667d023095,0xf723fda094465e13cb5a5cc981c945f,0x10 \ No newline at end of file diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor16p160.csv b/src/cz/crcs/ectester/data/cofactor/cofactor16p160.csv deleted file mode 100644 index 4d82274..0000000 --- a/src/cz/crcs/ectester/data/cofactor/cofactor16p160.csv +++ /dev/null @@ -1 +0,0 @@ -0x85836f09b17d1ec0cdeda21b55485e18dd968323,0x5480f9557c649a8e30f1e1256d07b0e32483ac68,0x0ecd880812f41c97be8b5daf1865725753b2ba37,0x16e1dd32469e75aa72a1dc48b78587b18e4f9874,0x70920054032065a09fad53a3ca69de634634a421,0x85836f09b17d1ec0cdecfe96b46937bbf135dab,0x10 \ No newline at end of file diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor16t163.csv b/src/cz/crcs/ectester/data/cofactor/cofactor16t163.csv deleted file mode 100644 index decdad3..0000000 --- a/src/cz/crcs/ectester/data/cofactor/cofactor16t163.csv +++ /dev/null @@ -1 +0,0 @@ -0xa3,0x8,0x2,0x1,0x0574f63f2c0fc757663ccda72b2ec8a37e7c84dfbc,0x03816a247d9618c4d1431793a2b9aaa8c5235ba047,0x074e2cfe3199fe1d5fb2cd8cc2e9aa8bf82ec4e90a,0x02942efd0f0619aaabd77de3f48da81138ab6dccc6,0x7fffffffffffffffffffbd3a47e6e6c2e2d09335,0x10 diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor16t233.csv b/src/cz/crcs/ectester/data/cofactor/cofactor16t233.csv deleted file mode 100644 index d838407..0000000 --- a/src/cz/crcs/ectester/data/cofactor/cofactor16t233.csv +++ /dev/null @@ -1 +0,0 @@ -0xe9,0x4a,0x0,0x0,0x017e449f630dcabb0206c5d3d788c030f5b817f7a9b37e9a851aa511e3b9,0x0134978d6868f9c83bfee60f609e31efa87910ccbe160ef2096fe06dc179,0x00bbcfcfdfb70ec830fb88d68d78dbbceaacd5d072194bf584e5e13c82a7,0x0177b6ab31a325d0e23664224bef711cdf9c2abb9f4016777519ead3c1be,0x1ffffffffffffffffffffffffffffec2ff067f4db9e97b04f2f6e5cac3,0x10 \ No newline at end of file diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor233t128.csv b/src/cz/crcs/ectester/data/cofactor/cofactor233t128.csv new file mode 100644 index 0000000..48505d4 --- /dev/null +++ b/src/cz/crcs/ectester/data/cofactor/cofactor233t128.csv @@ -0,0 +1 @@ +0xe9,0x4a,0x0,0x0,0x010ce87b92d6866c18d14efba7025388574f670476169b09929bbe2b7a4a,0x001ab1f0aecfe5ee45923aad73ea5fa24b554f91ff41a8fd5529d55e76f8,0x009d7d0edc1868aa15931051f8b084e25e8b0f2098994483cab3737c021e,0x01f663c194c41dd386976d105acd3be135ceb5f0d69f932565bc4706e2a9,0x3ffffffffffffffffffffffffffffd7489d946218417d25b50e07c781,0x80 \ No newline at end of file diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor233t16.csv b/src/cz/crcs/ectester/data/cofactor/cofactor233t16.csv new file mode 100644 index 0000000..d838407 --- /dev/null +++ b/src/cz/crcs/ectester/data/cofactor/cofactor233t16.csv @@ -0,0 +1 @@ +0xe9,0x4a,0x0,0x0,0x017e449f630dcabb0206c5d3d788c030f5b817f7a9b37e9a851aa511e3b9,0x0134978d6868f9c83bfee60f609e31efa87910ccbe160ef2096fe06dc179,0x00bbcfcfdfb70ec830fb88d68d78dbbceaacd5d072194bf584e5e13c82a7,0x0177b6ab31a325d0e23664224bef711cdf9c2abb9f4016777519ead3c1be,0x1ffffffffffffffffffffffffffffec2ff067f4db9e97b04f2f6e5cac3,0x10 \ No newline at end of file diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor233t2.csv b/src/cz/crcs/ectester/data/cofactor/cofactor233t2.csv new file mode 100644 index 0000000..61a945f --- /dev/null +++ b/src/cz/crcs/ectester/data/cofactor/cofactor233t2.csv @@ -0,0 +1 @@ +0xe9,0x4a,0x0,0x0,0x019a6dad09843e156188ee96105aa483897804180dc3f47e9ffed7b51d76,0x00bc002063484a714b1ca2a677fe17fb6c27843689568889c6d3088efce0,0x0117230ce450dd966713f13cfab77972da6680aaad37bc6409b4d153b36a,0x0071b5d13375216cf1e0ddc0bd2b243bad4a91f55c724b7d68af2db21602,0xfffffffffffffffffffffffffffff7359ae340ea86da4edade0cf53e23,0x2 \ No newline at end of file diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor233t32.csv b/src/cz/crcs/ectester/data/cofactor/cofactor233t32.csv new file mode 100644 index 0000000..4f14dfe --- /dev/null +++ b/src/cz/crcs/ectester/data/cofactor/cofactor233t32.csv @@ -0,0 +1 @@ +0xe9,0x4a,0x0,0x0,0x013c676464927c22282b42616b5d5e09a85468727495eae00e57afd170b8,0x009c6a29ca055f2c9b6714f529a83151c68f44bdbdf86d2f87a40cd8d8ec,0x01d12094657da0b94c14ab67b1ce85c4b16042e29b65ace2e448f4b3b8fd,0x012862bf9015dc35bf721429723ebf870cd026aff3acdc4282d0ff8f847f,0xfffffffffffffffffffffffffffffe6f9adb7f42e7c7ed65369ce8495,0x20 \ No newline at end of file diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor233t4.csv b/src/cz/crcs/ectester/data/cofactor/cofactor233t4.csv new file mode 100644 index 0000000..1972de2 --- /dev/null +++ b/src/cz/crcs/ectester/data/cofactor/cofactor233t4.csv @@ -0,0 +1 @@ +0xe9,0x4a,0x0,0x0,0x01d16ca19fdddd29cbef9f7d8edcd5bd5a2e51b1331f456d9a7c07ee40ef,0x00b59ca10c75cab015f7932ea7791a90d0edecba979a8ddaeca053d802b8,0x0163e7db23aacfce4573c1c72a8e09d064a5b99e3975ddbeb38ea66dd115,0x012a42b5d1b9614640705e86637fd3d5df1e988d843feab2df701ed0d2b3,0x8000000000000000000000000000061aa6c6684ad065bd4087bc36316d,0x4 \ No newline at end of file diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor233t64.csv b/src/cz/crcs/ectester/data/cofactor/cofactor233t64.csv new file mode 100644 index 0000000..df9e357 --- /dev/null +++ b/src/cz/crcs/ectester/data/cofactor/cofactor233t64.csv @@ -0,0 +1 @@ +0xe9,0x4a,0x0,0x0,0x003037f3c3b8be56c1b40f21898a14c0506810a2c2edee866d98d155bafe,0x010c0d410fef2163d820cf726df422e57f28ecb380587a8a166217b49fbf,0x01d00a40f4a7da1dfc8f87b8fc9981beebec0a5336452a7732c3216a5d71,0x0077dc35e9d9a730d80a7f5e22e8df145ea82ee8bd7bc178a9d14f3d6e4f,0x7fffffffffffffffffffffffffffff58ae3a5ab58e4794d5a0d31a0df,0x40 \ No newline at end of file diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor233t8.csv b/src/cz/crcs/ectester/data/cofactor/cofactor233t8.csv new file mode 100644 index 0000000..43f6705 --- /dev/null +++ b/src/cz/crcs/ectester/data/cofactor/cofactor233t8.csv @@ -0,0 +1 @@ +0xe9,0x4a,0x0,0x0,0x01c2ddc23a454bacf481ab17cd223d5b9b452c50de07c65c4eb3bb2a6c2f,0x01db7ca30cf0915e8ee53c3ba32371bc73a73f4f499839257a861f6123f8,0x0101da5b2520f16fba2d08f3687db69862ecfec9aa3cd81e3a53120c596c,0x0095d00741d7dc2119cb427b8a0dd77a2bcaef233086dd7704a438e0294e,0x3ffffffffffffffffffffffffffffc34eca9e37b884d13683d26dc874f,0x8 \ No newline at end of file diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor2p128.csv b/src/cz/crcs/ectester/data/cofactor/cofactor2p128.csv deleted file mode 100644 index d9857d8..0000000 --- a/src/cz/crcs/ectester/data/cofactor/cofactor2p128.csv +++ /dev/null @@ -1 +0,0 @@ -0xf07c2775c51f358b8bdab54821aaa5ab,0x54e4afb6f93de32081be13f858262bc7,0xe13c739a7fe7f62812babb3cba8c6b1f,0x43cefc1ddc7d6936b0db49ecb4b8c4d9,0x52579151eb2779295b75cd7226895abb,0x783e13bae28f9ac60c18591fe953fbf7,0x2 \ No newline at end of file diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor2p160.csv b/src/cz/crcs/ectester/data/cofactor/cofactor2p160.csv deleted file mode 100644 index 54717af..0000000 --- a/src/cz/crcs/ectester/data/cofactor/cofactor2p160.csv +++ /dev/null @@ -1 +0,0 @@ -0xd3622579d76435736f05756763249bb0facdc4a3,0xa645cc4161eb7cd8839b6e26c3efb6734b5bdc65,0xb1900e655c426daea7b80fecdd77ba19a9bb473c,0x2cfbf234e0d99ce44fdaedd2ec2e01558e6d7fd7,0x1495986fef15ada29c39866ac03ddc934589dffc,0x69b112bcebb21ab9b782a0dac36ea8fa7be5fd1b,0x2 \ No newline at end of file diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor2t163.csv b/src/cz/crcs/ectester/data/cofactor/cofactor2t163.csv deleted file mode 100644 index d837a28..0000000 --- a/src/cz/crcs/ectester/data/cofactor/cofactor2t163.csv +++ /dev/null @@ -1 +0,0 @@ -0xa3,0x8,0x2,0x1,0x020e850e21d5bfce24ff184c220ea69b20bad05c65,0x0547b079a38b6094672f6cb5adefa94ba1a29d977b,0x0156bee74ac2552ee999cff24e1d7c471ffc17d0c7,0x04a955c7e3b3534d9fd168d9fbffea3acca23c1fdd,0x400000000000000000001e699c7714c35b242f43b,0x2 \ No newline at end of file diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor2t233.csv b/src/cz/crcs/ectester/data/cofactor/cofactor2t233.csv deleted file mode 100644 index 61a945f..0000000 --- a/src/cz/crcs/ectester/data/cofactor/cofactor2t233.csv +++ /dev/null @@ -1 +0,0 @@ -0xe9,0x4a,0x0,0x0,0x019a6dad09843e156188ee96105aa483897804180dc3f47e9ffed7b51d76,0x00bc002063484a714b1ca2a677fe17fb6c27843689568889c6d3088efce0,0x0117230ce450dd966713f13cfab77972da6680aaad37bc6409b4d153b36a,0x0071b5d13375216cf1e0ddc0bd2b243bad4a91f55c724b7d68af2db21602,0xfffffffffffffffffffffffffffff7359ae340ea86da4edade0cf53e23,0x2 \ No newline at end of file diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor32p128.csv b/src/cz/crcs/ectester/data/cofactor/cofactor32p128.csv deleted file mode 100644 index 9673835..0000000 --- a/src/cz/crcs/ectester/data/cofactor/cofactor32p128.csv +++ /dev/null @@ -1 +0,0 @@ -0x8d4ee802a67d0de73b9ec4f1a70227b7,0x70b4c15289f93fbc9247509fc9085396,0x04dfb7818caa18da2a60b50f0056a62b,0x09907655c9579e02b30534529dc0031a,0x365f28ab09d64508b47519fea58f4035,0x46a77401533e86f405231d0d851b3d9,0x20 \ No newline at end of file diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor32p160.csv b/src/cz/crcs/ectester/data/cofactor/cofactor32p160.csv deleted file mode 100644 index 75238ea..0000000 --- a/src/cz/crcs/ectester/data/cofactor/cofactor32p160.csv +++ /dev/null @@ -1 +0,0 @@ -0x91634da0ec681dd6ba65beaf596d82b262b4cded,0x747c9302638253325e847cb5f0cf71134e672ec5,0x68ac504eba7a475a52b2bff92b5b77fb16f124b8,0x721dbbff58bc41dff64da7bd7a45d9892f659306,0x6d353cfdf9570402ccd11b9651a2d4be5d4f1853,0x48b1a6d076340eeb5d33371825941b3e0012e99,0x20 \ No newline at end of file diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor32t163.csv b/src/cz/crcs/ectester/data/cofactor/cofactor32t163.csv deleted file mode 100644 index 2b88982..0000000 --- a/src/cz/crcs/ectester/data/cofactor/cofactor32t163.csv +++ /dev/null @@ -1 +0,0 @@ -0xa3,0x8,0x2,0x1,0x04a4e7bb96ff9007b4be8097c5c4e36701e3f22aa8,0x020d55ea20c74a09f86cc1b2ecf2d073f46ad9b7fa,0x05f7347502518870fc7419e2d0e3170d5b04333a48,0x05951c6d70c789d60bd25b2519416dc756da26d320,0x3fffffffffffffffffffe88d1f6ec2029eaf4f9d,0x20 diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor32t233.csv b/src/cz/crcs/ectester/data/cofactor/cofactor32t233.csv deleted file mode 100644 index 4f14dfe..0000000 --- a/src/cz/crcs/ectester/data/cofactor/cofactor32t233.csv +++ /dev/null @@ -1 +0,0 @@ -0xe9,0x4a,0x0,0x0,0x013c676464927c22282b42616b5d5e09a85468727495eae00e57afd170b8,0x009c6a29ca055f2c9b6714f529a83151c68f44bdbdf86d2f87a40cd8d8ec,0x01d12094657da0b94c14ab67b1ce85c4b16042e29b65ace2e448f4b3b8fd,0x012862bf9015dc35bf721429723ebf870cd026aff3acdc4282d0ff8f847f,0xfffffffffffffffffffffffffffffe6f9adb7f42e7c7ed65369ce8495,0x20 \ No newline at end of file diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor4p128.csv b/src/cz/crcs/ectester/data/cofactor/cofactor4p128.csv deleted file mode 100644 index 44363ad..0000000 --- a/src/cz/crcs/ectester/data/cofactor/cofactor4p128.csv +++ /dev/null @@ -1 +0,0 @@ -0x94d9020b666fbb599609485472a9246f,0x8220ebe30c27e10f945b0c2cdfe6dcaa,0x1914928b1a349161061165128629ea88,0x6a1a526fe3d4f719082872b2d149a90f,0x423351dae6533a1a916b151cd0783165,0x25364082d99beed620f8082db41374e7,0x4 \ No newline at end of file diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor4p160.csv b/src/cz/crcs/ectester/data/cofactor/cofactor4p160.csv deleted file mode 100644 index 760dbef..0000000 --- a/src/cz/crcs/ectester/data/cofactor/cofactor4p160.csv +++ /dev/null @@ -1 +0,0 @@ -0x93ab454ad26dae3b521d5b61a48c94cab3c4aa9d,0x4b2d384edb6b10bdaf4c608cc5aff078c4c58e38,0x35bc442cc9f7fe4317cf36d4f411c98f26956527,0x216d191d642aab59fca4ec18b95e11a298da5a00,0x09d9b5f44253719aeb44d3986c40ee3d9c9d86c9,0x24ead152b49b6b8ed4874ccca8f78da90add8ceb,0x4 \ No newline at end of file diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor4t163.csv b/src/cz/crcs/ectester/data/cofactor/cofactor4t163.csv deleted file mode 100644 index 61f7b03..0000000 --- a/src/cz/crcs/ectester/data/cofactor/cofactor4t163.csv +++ /dev/null @@ -1 +0,0 @@ -0xa3,0x8,0x2,0x1,0x027b506a68264c13994a74473ebd0506ce33921b00,0x0483681d34fdc0544a690cd8363ef6876bc9df5b09,0x051d0095b0d49e8b9b2e38a49ab58abb28b8301349,0x0427559b4db514f0659cbc45a1a785ff3c32f0d0c5,0x1fffffffffffffffffffff89941a8461c966379ad,0x4 \ No newline at end of file diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor4t233.csv b/src/cz/crcs/ectester/data/cofactor/cofactor4t233.csv deleted file mode 100644 index 1972de2..0000000 --- a/src/cz/crcs/ectester/data/cofactor/cofactor4t233.csv +++ /dev/null @@ -1 +0,0 @@ -0xe9,0x4a,0x0,0x0,0x01d16ca19fdddd29cbef9f7d8edcd5bd5a2e51b1331f456d9a7c07ee40ef,0x00b59ca10c75cab015f7932ea7791a90d0edecba979a8ddaeca053d802b8,0x0163e7db23aacfce4573c1c72a8e09d064a5b99e3975ddbeb38ea66dd115,0x012a42b5d1b9614640705e86637fd3d5df1e988d843feab2df701ed0d2b3,0x8000000000000000000000000000061aa6c6684ad065bd4087bc36316d,0x4 \ No newline at end of file diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor64p128.csv b/src/cz/crcs/ectester/data/cofactor/cofactor64p128.csv deleted file mode 100644 index 35a5ecc..0000000 --- a/src/cz/crcs/ectester/data/cofactor/cofactor64p128.csv +++ /dev/null @@ -1 +0,0 @@ -0xc3d6db041a0c509309d706a52a9ae20d,0x6234008af9a67b1a0cf123a38a46d0fb,0x65ca327cc79249fd9b4f3a1c15890787,0x57c0a37da59815687f752f724f015b21,0x9136e347e107c2f5face9abd739f6a82,0x30f5b6c1068314251fbe0d341f0c569,0x40 \ No newline at end of file diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor64p160.csv b/src/cz/crcs/ectester/data/cofactor/cofactor64p160.csv deleted file mode 100644 index 4cdcfdc..0000000 --- a/src/cz/crcs/ectester/data/cofactor/cofactor64p160.csv +++ /dev/null @@ -1 +0,0 @@ -0xfe2a2fe87bef6a429245c029cf205f06e16cd249,0xc42dc19e1c0c0b0dd27758d2787d526b25ad89b5,0xf72edb299fab1b613708d4165ededab65350fe6c,0x104a825944921b469704babb2727e5f8a829f2e1,0x8b955a5059e68cc0e932bbdb90fe81730c8e4d19,0x3f8a8bfa1efbda90a4917c6c340f970a5fce9c3,0x40 \ No newline at end of file diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor64t163.csv b/src/cz/crcs/ectester/data/cofactor/cofactor64t163.csv deleted file mode 100644 index 6d3ee91..0000000 --- a/src/cz/crcs/ectester/data/cofactor/cofactor64t163.csv +++ /dev/null @@ -1 +0,0 @@ -0xa3,0x8,0x2,0x1,0x041a27de41f0e09c7cd4ff65fe10d472c9ca652ea1,0x00b27568b80c64d610ffdde6b3f520df0e0c499aa8,0x04f3cce508325c822a5e04044014d785e9b55ef95e,0x010021cb58589ea7cc7a8caea926276eb32db24b45,0x1ffffffffffffffffffff192d95b4d882a5ee3b9,0x40 diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor64t233.csv b/src/cz/crcs/ectester/data/cofactor/cofactor64t233.csv deleted file mode 100644 index df9e357..0000000 --- a/src/cz/crcs/ectester/data/cofactor/cofactor64t233.csv +++ /dev/null @@ -1 +0,0 @@ -0xe9,0x4a,0x0,0x0,0x003037f3c3b8be56c1b40f21898a14c0506810a2c2edee866d98d155bafe,0x010c0d410fef2163d820cf726df422e57f28ecb380587a8a166217b49fbf,0x01d00a40f4a7da1dfc8f87b8fc9981beebec0a5336452a7732c3216a5d71,0x0077dc35e9d9a730d80a7f5e22e8df145ea82ee8bd7bc178a9d14f3d6e4f,0x7fffffffffffffffffffffffffffff58ae3a5ab58e4794d5a0d31a0df,0x40 \ No newline at end of file diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor8p128.csv b/src/cz/crcs/ectester/data/cofactor/cofactor8p128.csv deleted file mode 100644 index 94d4b4e..0000000 --- a/src/cz/crcs/ectester/data/cofactor/cofactor8p128.csv +++ /dev/null @@ -1 +0,0 @@ -0xe65f3e99554260c832ee6c21ec3ac437,0x0ff5c77f9c00ad42c58878e9510a059e,0x0652b998c3bfeefe20afc97a2b6595f4,0xc8a6fef9cbda700c097a1c3ddcaf3d0d,0x602bc0de98577bf266432e60fabe4946,0x1ccbe7d32aa84c191817ef7e51812989,0x8 \ No newline at end of file diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor8p160.csv b/src/cz/crcs/ectester/data/cofactor/cofactor8p160.csv deleted file mode 100644 index 60ca98e..0000000 --- a/src/cz/crcs/ectester/data/cofactor/cofactor8p160.csv +++ /dev/null @@ -1 +0,0 @@ -0xe40476bfeb2a3fd21ad80c102aad29f61cec5eaf,0x544ccbf7202e6b6d27fc19a3587eecc4ec665430,0x86690f7849e1707b28c24b718e7ffa36b55677b5,0x836cee7bcecb29d171c4bd9a1b4943e8159e4708,0xa0add6ab4a0729fd2719e5767abfc4d4c49ff802,0x1c808ed7fd6547fa435b03ffd3b931cccc8c098f,0x8 \ No newline at end of file diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor8t163.csv b/src/cz/crcs/ectester/data/cofactor/cofactor8t163.csv deleted file mode 100644 index 349e874..0000000 --- a/src/cz/crcs/ectester/data/cofactor/cofactor8t163.csv +++ /dev/null @@ -1 +0,0 @@ -0xa3,0x8,0x2,0x1,0x0183b7c0268ef09222560b602c9444aeb218a9b1c8,0x0035948fa062ffab3e7e63de769fec1407c6b85c6c,0x04d3aaef5f5075d1bbf92e9a5393af45b6946e2074,0x041df30932c95f4732fd59593e11aef8bb46ef3b6c,0x100000000000000000000762c81022ff40e2843f1,0x8 \ No newline at end of file diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor8t233.csv b/src/cz/crcs/ectester/data/cofactor/cofactor8t233.csv deleted file mode 100644 index 43f6705..0000000 --- a/src/cz/crcs/ectester/data/cofactor/cofactor8t233.csv +++ /dev/null @@ -1 +0,0 @@ -0xe9,0x4a,0x0,0x0,0x01c2ddc23a454bacf481ab17cd223d5b9b452c50de07c65c4eb3bb2a6c2f,0x01db7ca30cf0915e8ee53c3ba32371bc73a73f4f499839257a861f6123f8,0x0101da5b2520f16fba2d08f3687db69862ecfec9aa3cd81e3a53120c596c,0x0095d00741d7dc2119cb427b8a0dd77a2bcaef233086dd7704a438e0294e,0x3ffffffffffffffffffffffffffffc34eca9e37b884d13683d26dc874f,0x8 \ No newline at end of file diff --git a/src/cz/crcs/ectester/data/cofactor/curves.xml b/src/cz/crcs/ectester/data/cofactor/curves.xml index 559d10b..bb8a905 100644 --- a/src/cz/crcs/ectester/data/cofactor/curves.xml +++ b/src/cz/crcs/ectester/data/cofactor/curves.xml @@ -3,40 +3,40 @@ xsi:noNamespaceSchemaLocation="../schema.xsd"> - cofactor2p128 + cofactor128p2 128 prime - cofactor2p128.csv + cofactor128p2.csv - cofactor4p128 + cofactor128p4 128 prime - cofactor4p128.csv + cofactor128p4.csv - cofactor8p128 + cofactor128p8 128 prime - cofactor8p128.csv + cofactor128p8.csv - cofactor16p128 + cofactor128p16 128 prime - cofactor16p128.csv + cofactor128p16.csv - cofactor32p128 + cofactor128p32 128 prime - cofactor32p128.csv + cofactor128p32.csv - cofactor64p128 + cofactor128p64 128 prime - cofactor64p128.csv + cofactor128p64.csv cofactor128p128 @@ -46,126 +46,126 @@ - cofactor2p160 + cofactor160p2 160 prime - cofactor2p160.csv + cofactor160p2.csv - cofactor4p160 + cofactor160p4 160 prime - cofactor4p160.csv + cofactor160p4.csv - cofactor8p160 + cofactor160p8 160 prime - cofactor8p160.csv + cofactor160p8.csv - cofactor16p160 + cofactor160p16 160 prime - cofactor16p160.csv + cofactor160p16.csv - cofactor32p160 + cofactor160p32 160 prime - cofactor32p160.csv + cofactor160p32.csv - cofactor64p160 + cofactor160p64 160 prime - cofactor64p160.csv + cofactor160p64.csv - cofactor2t163 + cofactor163t2 163 binary - cofactor2t163.csv + cofactor163t2.csv - cofactor4t163 + cofactor163t4 163 binary - cofactor4t163.csv + cofactor163t4.csv - cofactor8t163 + cofactor163t8 163 binary - cofactor8t163.csv + cofactor163t8.csv - cofactor16t163 + cofactor163t16 163 binary - cofactor16t163.csv + cofactor163t16.csv - cofactor32t163 + cofactor163t32 163 binary - cofactor32t163.csv + cofactor163t32.csv - cofactor64t163 + cofactor163t64 163 binary - cofactor64t163.csv + cofactor163t64.csv - cofactor128t163 + cofactor163t128 163 binary - cofactor128t163.csv + cofactor163t128.csv - cofactor2t233 + cofactor233t2 233 binary - cofactor2t233.csv + cofactor233t2.csv - cofactor4t233 + cofactor233t4 233 binary - cofactor4t233.csv + cofactor233t4.csv - cofactor8t233 + cofactor233t8 233 binary - cofactor8t233.csv + cofactor233t8.csv - cofactor16t233 + cofactor233t16 233 binary - cofactor16t233.csv + cofactor233t16.csv - cofactor32t233 + cofactor233t32 233 binary - cofactor32t233.csv + cofactor233t32.csv - cofactor64t233 + cofactor233t64 233 binary - cofactor64t233.csv + cofactor233t64.csv - cofactor128t233 + cofactor233t128 233 binary - cofactor128t233.csv + cofactor233t128.csv diff --git a/src/cz/crcs/ectester/data/cofactor/keys.xml b/src/cz/crcs/ectester/data/cofactor/keys.xml index 100142b..8cf19a1 100644 --- a/src/cz/crcs/ectester/data/cofactor/keys.xml +++ b/src/cz/crcs/ectester/data/cofactor/keys.xml @@ -8,170 +8,638 @@ desc=""> - cofactor2p128/0 + cofactor128p2/0 0x1274cf343b12c9de044a312c7e0d88b1,0x00000000000000000000000000000000 - cofactor/cofactor2p128 - order = 2 + cofactor/cofactor128p2 + cofactor order = 2 - cofactor4p128/0 + cofactor128p4/0 0x4e5a1eb60f6d2cb5c24f6ea54a675cd6,0x00000000000000000000000000000000 - cofactor/cofactor4p128 - order = 2 + cofactor/cofactor128p4 + cofactor order = 2 - cofactor8p128/0 + cofactor128p4/1 + 0x71223b82022305c5eb81f5c3ae3f785a,0x79fc820c0eecef0bca540a3e723583ff + cofactor/cofactor128p4 + cofactor order = 4 + + + cofactor128p8/0 0x31eb5f732057b0ea57eed55f4259d85d,0x00000000000000000000000000000000 - cofactor/cofactor8p128 - order = 2 + cofactor/cofactor128p8 + cofactor order = 2 + + + cofactor128p8/1 + 0x2e7bb6ad57bbcbef6dc2bf4245a38c12,0x61d860ec5fe722872c35dfa1ef84a307 + cofactor/cofactor128p8 + cofactor order = 4 + + + cofactor128p8/2 + 0x901934de82c48d1058c67c605a9a390b,0x335c2e8e79a171506a99490d3332a110 + cofactor/cofactor128p8 + cofactor order = 8 - cofactor16p128/0 + cofactor128p16/0 0x89578c4527e2d5e8a95905e30f0889e3,0x00000000000000000000000000000000 - cofactor/cofactor16p128 - order = 2 + cofactor/cofactor128p16 + cofactor order = 2 + + + cofactor128p16/1 + 0x99efc5bd2e9adc1c00919ddf5bf7ace0,0x082767ef35dad2259725c77e68bf8a69 + cofactor/cofactor128p16 + cofactor order = 4 + + + cofactor128p16/2 + 0x5e2f995dad72a38bd8c9f9a7f465ce6f,0xc6dc35c4d28a668f8240ef6ac2536b14 + cofactor/cofactor128p16 + cofactor order = 8 + + + cofactor128p16/3 + 0xe719245896fb0737d55085e208aafec2,0xf672a92221d12ed6ec4657ca767a7f06 + cofactor/cofactor128p16 + cofactor order = 16 - cofactor32p128/0 + cofactor128p32/0 0x097191ee5ded1c36f2ec6bba78e7e6ea,0x00000000000000000000000000000000 - cofactor/cofactor32p128 - order = 2 + cofactor/cofactor128p32 + cofactor order = 2 + + + cofactor128p32/1 + 0x527a9d644ebae128748327d1961c3985,0x4edca8a611b16dee95eeea363724062d + cofactor/cofactor128p32 + cofactor order = 4 - cofactor64p128/0 + cofactor128p32/2 + 0x5faf8263ac8c51084b0aff1bd428f092,0x2680273ff79343d47280c69168973cf5 + cofactor/cofactor128p32 + cofactor order = 8 + + + cofactor128p32/3 + 0x0351f0e0b0de971c953918934f59c8c0,0x424957e4a6756cc1e55d36489cff3d8b + cofactor/cofactor128p32 + cofactor order = 16 + + + cofactor128p32/4 + 0x5c5e4942cf366e1b04bed7b1ca3bd4a9,0x3549e46c6696ed157ccc74adc65683ae + cofactor/cofactor128p32 + cofactor order = 32 + + + cofactor128p64/0 0x1d360b7f2f805be59aedeaae2813ee1f,0x00000000000000000000000000000000 - cofactor/cofactor64p128 - order = 2 + cofactor/cofactor128p64 + cofactor order = 2 + + + cofactor128p64/1 + 0x87c97b7182f883ded6560cd78264ad5b,0x468dbd5fe82135ea24a71059341f16cb + cofactor/cofactor128p64 + cofactor order = 4 + + + cofactor128p64/2 + 0x9498a4ec5caf6d7d8638dc6d79ae30d7,0x4a8412b51a48b34c6f33047052979ebf + cofactor/cofactor128p64 + cofactor order = 8 + + + cofactor128p64/3 + 0x7bd10415384645d1dfe4c84e8f05c301,0x37878a8d0088d16cf88f49c07c13147b + cofactor/cofactor128p64 + cofactor order = 16 + + + cofactor128p64/4 + 0x9781df3d77ae756e8cb031303f7332a1,0xb0014e02d54b017e4069401fc41a9a23 + cofactor/cofactor128p64 + cofactor order = 32 + + + cofactor128p64/5 + 0xb8fde1c676a1ceab9ad6597f9763c79f,0x5490d7c81d8ddece1a4081a743910b46 + cofactor/cofactor128p64 + cofactor order = 64 cofactor128p128/0 0x485b34188824c54f115f31891c18795c,0x00000000000000000000000000000000 cofactor/cofactor128p128 - order = 2 + cofactor order = 2 + + + cofactor128p128/1 + 0x1e75df97d9c90de9338ea741cc6fa72e,0x80308fe46db0ed0486bb204c97cb0891 + cofactor/cofactor128p128 + cofactor order = 4 + + + cofactor128p128/2 + 0x789c0de0acc72fa82609c27b1ff26031,0x38eaf5e148dd91fe151cc072ce4945be + cofactor/cofactor128p128 + cofactor order = 8 + + + cofactor128p128/3 + 0xace50433b400257c911cbcc175bf03a1,0x6f0cd218b21a252a289d49981a554232 + cofactor/cofactor128p128 + cofactor order = 16 + + + cofactor128p128/4 + 0x0144308e82b8c4edd3b02a535fcd9b11,0x241c16e9c41948dd249741b623ae6f46 + cofactor/cofactor128p128 + cofactor order = 32 + + + cofactor128p128/5 + 0x17c76910a9acbde84033e2fcc629350a,0x462e9fa1f47d82b3e82c813368ffe005 + cofactor/cofactor128p128 + cofactor order = 64 + + + cofactor128p128/6 + 0x2f633a2a7176d5e89e53db656761884d,0x04806528aae79ad5953f985f703fe3ed + cofactor/cofactor128p128 + cofactor order = 128 - cofactor2p160/0 + cofactor160p2/0 0x5fa441bf614740860b6eb17c525fadf7fda8a8dd,0x0000000000000000000000000000000000000000 - cofactor/cofactor2p160 - order = 2 + cofactor/cofactor160p2 + cofactor order = 2 - cofactor4p160/0 + cofactor160p4/0 0x023deee1d84150a62b98aa5bfc199af554653515,0x0000000000000000000000000000000000000000 - cofactor/cofactor4p160 - order = 2 + cofactor/cofactor160p4 + cofactor order = 2 - cofactor8p160/0 + cofactor160p4/1 + 0x029177e40c5fa71b99189487dd216c20878ddc2b,0x8208f20780b73baa1c19aec658707b070b675de2 + cofactor/cofactor160p4 + cofactor order = 4 + + + cofactor160p8/0 0x05e55a12fb3fc534266721e50921b87175ba6058,0x0000000000000000000000000000000000000000 - cofactor/cofactor8p160 - order = 2 + cofactor/cofactor160p8 + cofactor order = 2 + + + cofactor160p8/1 + 0xcabc8915d9a3ec3918425a100c46455dac4a69b9,0x899e34cfb8138627bddf44123ec5875bbe77607a + cofactor/cofactor160p8 + cofactor order = 4 + + + cofactor160p8/2 + 0xabe45c362bd99dc1d473ece28afe13c21fa4d759,0x7fcb17eb63260522d911eca08a4f6174163e2869 + cofactor/cofactor160p8 + cofactor order = 8 - cofactor16p160/0 + cofactor160p16/0 0x1e20529f2293f0a08cc722d7fa8e56ddd4eb3b8a,0x0000000000000000000000000000000000000000 - cofactor/cofactor16p160 - order = 2 + cofactor/cofactor160p16 + cofactor order = 2 - cofactor32p160/0 + cofactor160p16/1 + 0x8076835b64ee29e80caacb94a09fbf465bb283d2,0x0a772fb6cdfc5ca2a6ce58ce77c36c3e572319f2 + cofactor/cofactor160p16 + cofactor order = 4 + + + cofactor160p16/2 + 0x438873cc4cfe75ea5e4cd253a999bd383679643e,0x5aeea5de1639443278f0ef03d196cb87b9818886 + cofactor/cofactor160p16 + cofactor order = 8 + + + cofactor160p16/3 + 0x76f900fcc2c879c8c78e3a2c25ff0322d3dc1234,0x0a1980eaf1f4d35f736087a4b7df844c61665c03 + cofactor/cofactor160p16 + cofactor order = 16 + + + cofactor160p32/0 0x8cff23fa9830f93cb2d46aa5f91e6f53080fa5b7,0x0000000000000000000000000000000000000000 - cofactor/cofactor32p160 - order = 2 + cofactor/cofactor160p32 + cofactor order = 2 - cofactor64p160/0 + cofactor160p32/1 + 0x776031adf083c2373e49d38f6e4fff890a723b20,0x7fb4468b1937d569889b9aa06e0e4ec66032a07f + cofactor/cofactor160p32 + cofactor order = 4 + + + cofactor160p32/2 + 0x80808ea2da912ddd3ef23c2b4a7a5f7a0c49d97f,0x0c4664470b36a7873650c0ce856eccf5c715202e + cofactor/cofactor160p32 + cofactor order = 8 + + + cofactor160p32/3 + 0x6489b721683b235b1e195df3fc588b8469a53f92,0x745764261684c3056725df16a14ae71a9ce669f8 + cofactor/cofactor160p32 + cofactor order = 16 + + + cofactor160p32/4 + 0x755a0b8b58e0d8f18998e2c2b7b9ab09792323d6,0x90e7c831aba6c27762bef58bf07b782334da565d + cofactor/cofactor160p32 + cofactor order = 32 + + + cofactor160p64/0 0x46b72d87edddeea2fa3ef32725fcf8c1e19bf40d,0x0000000000000000000000000000000000000000 - cofactor/cofactor64p160 - order = 2 + cofactor/cofactor160p64 + cofactor order = 2 + + + cofactor160p64/1 + 0x3e92edd49a08c7dc03badf986f0902292f15856d,0x7658a601d3aceb0b3273011d1211b8df18027f78 + cofactor/cofactor160p64 + cofactor order = 4 + + + cofactor160p64/2 + 0xa863b1077481ae1da7e782b56ef378aa79d94da0,0xf7b8ccdfee7605bf1b858f427480a15cb2b82728 + cofactor/cofactor160p64 + cofactor order = 8 + + + cofactor160p64/3 + 0x45a971943d80ce3f1f29ac86536c0e189ae98dc7,0x6e4488a53ee6cbea7ecec826a8f89f9334e90c7a + cofactor/cofactor160p64 + cofactor order = 16 + + + cofactor160p64/4 + 0x53499915b1a061db0216f7c871780abfb86c576e,0x44c57b310461b57c2d20c12dbeb64475e122e1a4 + cofactor/cofactor160p64 + cofactor order = 32 + + + cofactor160p64/5 + 0x3fabbf2a3612a89fb5940661b4acc7589cc7fce3,0xb5489c892a82a2f4e5bced433a3c4685b9ae0d07 + cofactor/cofactor160p64 + cofactor order = 64 - cofactor2t163/0 + cofactor163t2/0 0x000000000000000000000000000000000000000000,0x0132720c6aa3f2ca65d18f2de81e5e6b8ad4a3ef9d - cofactor/cofactor2t163 - order = 2 + cofactor/cofactor163t2 + cofactor order = 2 - cofactor4t163/0 + cofactor163t4/0 0x000000000000000000000000000000000000000000,0x00b93d46bc80b487e7738644e85bb6d29c2dca2600 - cofactor/cofactor4t163 - order = 2 + cofactor/cofactor163t4 + cofactor order = 2 - cofactor8t163/0 + cofactor163t4/1 + 0x003de55d59f7c71d1560c04954a897294b584c8840,0x069a5e172cea516563b7289330fcadd1b3a9a08ea5 + cofactor/cofactor163t4 + cofactor order = 4 + + + cofactor163t8/0 0x000000000000000000000000000000000000000000,0x0569879d9674b06578f62ec2f341ddd3b648dfdf51 - cofactor/cofactor8t163 - order = 2 + cofactor/cofactor163t8 + cofactor order = 2 + + + cofactor163t8/1 + 0x04558236ae8cbb8b7f551db9b7ffeba4d05a6925f8,0x07af55a9913a11785b3cd3f8b92d5968273bdbc6a7 + cofactor/cofactor163t8 + cofactor order = 4 + + + cofactor163t8/2 + 0x0180ead5cc93652110c10254291c060a6039102f2f,0x01c27f76b0e8f6c445ec14041ad6bf528133b0f5ba + cofactor/cofactor163t8 + cofactor order = 8 - cofactor16t163/0 + cofactor163t16/0 0x000000000000000000000000000000000000000000,0x04274cf55c49c32ca4c0e30b891e03b3b1c6597df0 - cofactor/cofactor16t163 - order = 2 + cofactor/cofactor163t16 + cofactor order = 2 + + + cofactor163t16/1 + 0x045a5eb7dd5d3a66c37ccc17d1c2cc278c52341311,0x00d335cb03f5cffe4aae83eca0142719ba056b3b91 + cofactor/cofactor163t16 + cofactor order = 4 - cofactor32t163/0 + cofactor163t16/2 + 0x02491353f117e84d3bccfdec06dc80881bf4962916,0x07a0e8a86cb7b13b4e7dff9c5a6c2cec2dfe43bd3c + cofactor/cofactor163t16 + cofactor order = 8 + + + cofactor163t16/3 + 0x06ef9e3bc176cc3e4f22734c6b1403a52fcb4f5ded,0x05b854eba0ed2c1b1ba58db768391935bc45008aed + cofactor/cofactor163t16 + cofactor order = 16 + + + cofactor163t32/0 0x000000000000000000000000000000000000000000,0x0409969efb468e8f07954a3b4bf7610a0d8b5d4753 - cofactor/cofactor32t163 - order = 2 + cofactor/cofactor163t32 + cofactor order = 2 + + + cofactor163t32/1 + 0x0718ffc297e2a28c40b1a99a1243788908bf234788,0x072c98ada87c3d2bd169ebb13484046487389c0aac + cofactor/cofactor163t32 + cofactor order = 4 + + + cofactor163t32/2 + 0x05398dacbc3685efa32fb8073f653a13454bdd84d1,0x04a3c63e84d6c2612d29cc73f8025c678c40fc238b + cofactor/cofactor163t32 + cofactor order = 8 + + + cofactor163t32/3 + 0x04ef69ff0767053e16dc764753dce52e4abd2008af,0x06179a3827cc46bc431e38960d33b9d55d6c589059 + cofactor/cofactor163t32 + cofactor order = 16 + + + cofactor163t32/4 + 0x02ee97f9a7d793ce62c74af97a9f096a7572ba69b9,0x000f6d594c47c324daa0e08324367fe6570dea1bf3 + cofactor/cofactor163t32 + cofactor order = 32 - cofactor64t163/0 + cofactor163t64/0 0x000000000000000000000000000000000000000000,0x068c5445c03a59d697573b09ae0804e2891bb98208 - cofactor/cofactor64t163 - order = 2 + cofactor/cofactor163t64 + cofactor order = 2 + + + cofactor163t64/1 + 0x07ebc6a2d17da53c7eb2d1db5b1c8f4bc09cbe0c9a,0x00d8dad45ee9b10d1b9c65e33779a9915dab1bcdca + cofactor/cofactor163t64 + cofactor order = 4 + + + cofactor163t64/2 + 0x06c2e736395e30d258e1d55e99754b13cb95df5a77,0x02c927a236717ee2a0023c2932b581b30e1198ba52 + cofactor/cofactor163t64 + cofactor order = 8 + + + cofactor163t64/3 + 0x02d043a910ce708b391974f4bf2d948b2ff9404ac1,0x0173d5211bd148c51a5356125b4e1037287ca76dbf + cofactor/cofactor163t64 + cofactor order = 16 + + + cofactor163t64/4 + 0x00b16f32c64daa847ecbb91ec3df09320b898753e8,0x0386287097ae6bc4fe440c21855dd51cbb063cfa01 + cofactor/cofactor163t64 + cofactor order = 32 + + + cofactor163t64/5 + 0x02d3b0a084b4c191d61cccb9906b072946e8167c7c,0x041c5c739372f85d9801de81ceae8610d1d46baa0b + cofactor/cofactor163t64 + cofactor order = 64 - cofactor128t163/0 + cofactor163t128/0 0x000000000000000000000000000000000000000000,0x06be374502a948489de2e7d8d82cb6b62a493b77a0 - cofactor/cofactor128t163 - order = 2 + cofactor/cofactor163t128 + cofactor order = 2 + + + cofactor163t128/1 + 0x06c8d7f80b6c2dfbb970c103dbe4823ddadbbc2d44,0x051d1ae93f3798b7d07dc5a42ae10b9ddbe6a27f9e + cofactor/cofactor163t128 + cofactor order = 4 + + + cofactor163t128/2 + 0x070bb18c1a173b81a08312cea7ae8be4e5085bd4e4,0x0196906f241cadfdad35b1e38754b01c1baf7f20da + cofactor/cofactor163t128 + cofactor order = 8 + + + cofactor163t128/3 + 0x02e6190b983edeed23a75c7905e625e9d4d5aab337,0x009be2cfb9d400f20f1ad38963fa756d3beea8b5f1 + cofactor/cofactor163t128 + cofactor order = 16 + + + cofactor163t128/4 + 0x01ddf5cb0517f268ac0446ec605c6c9e2f47cad1ad,0x06ff8b935fb64abcaadf9528c164278c4861190399 + cofactor/cofactor163t128 + cofactor order = 32 + + + cofactor163t128/5 + 0x03ead0b91adc1e11c6f1aea37993d4aa233f722f16,0x03566f6678f3f63004c084469330c55a54e47152ed + cofactor/cofactor163t128 + cofactor order = 64 + + + cofactor163t128/6 + 0x0597fab16d4fd300694e45e02ce97126d6abfdf527,0x013f75f2b43c53296f06fc584b02ab9b7e5eda28aa + cofactor/cofactor163t128 + cofactor order = 128 - cofactor2t233/0 + cofactor233t2/0 0x000000000000000000000000000000000000000000000000000000000000,0x00a5237785bb2d49881f043553257d8600988d9603b43b4c2d74539a7ab3 - cofactor/cofactor2t233 - order = 2 + cofactor/cofactor233t2 + cofactor order = 2 - cofactor4t233/0 + cofactor233t4/0 0x000000000000000000000000000000000000000000000000000000000000,0x01e70983b7039468a1b58b757d8343c7612f847f51f357ccca6a4c38e774 - cofactor/cofactor4t233 - order = 2 + cofactor/cofactor233t4 + cofactor order = 2 + + + cofactor233t4/1 + 0x01b2130e54e0b949f46bb1a356e4da9b117168171c95bd8f8606dbb841f0,0x00df888613dd7319af9881c87b3b96586a6ea0bc8763e460d1cfad59beeb + cofactor/cofactor233t4 + cofactor order = 4 - cofactor8t233/0 + cofactor233t8/0 0x000000000000000000000000000000000000000000000000000000000000,0x0087c295986f53382f7f1d4c8f268bdde12c5e2b641e53f84b5c2feb209a - cofactor/cofactor8t233 - order = 2 + cofactor/cofactor233t8 + cofactor order = 2 + + + cofactor233t8/1 + 0x00a84d10e99cdacf913bc463c64fe963874bd43f7b6285b3328c584f379d,0x0116083d4b7d721cab9f8e28687946775cbe53013974f0d64da6a3753871 + cofactor/cofactor233t8 + cofactor order = 4 - cofactor16t233/0 + cofactor233t8/2 + 0x0030b705cd14925afbc424bba3ca2d306e1919228fbdeb69722d778d2fd1,0x01b57b56dfd941a990349cfbe4738049158da63038002b8b66b1958a3f28 + cofactor/cofactor233t8 + cofactor order = 8 + + + cofactor233t16/0 0x000000000000000000000000000000000000000000000000000000000000,0x00c6ff713492ad9d63db4627a4f8d0d67388d85ea20ba5ef234a43ec98d4 - cofactor/cofactor16t233 - order = 2 + cofactor/cofactor233t16 + cofactor order = 2 + + + cofactor233t16/1 + 0x000054b1aeb9f6ec672eda79ea63d50afd64379da32c67b393613e5380a5,0x0007a5bcc9d28b17b3ee8b6c01146b418134d653dac30b9f141cadb8bdf3 + cofactor/cofactor233t16 + cofactor order = 4 + + + cofactor233t16/2 + 0x0076e03623260120f8abb528fa31087853a445dd4f4761aa4927d0c435e5,0x011d084efa87e9d129153bcdbc50177015ecfa822ae7b9bcc229b9f57987 + cofactor/cofactor233t16 + cofactor order = 8 + + + cofactor233t16/3 + 0x01e334dd359ca817a6b667a95c1c408387869583a7aad103d90dab7f07ab,0x0136e465f537139aad625893172512a06d242474c623003e5f90dd244997 + cofactor/cofactor233t16 + cofactor order = 16 - cofactor32t233/0 + cofactor233t32/0 0x000000000000000000000000000000000000000000000000000000000000,0x00e85ccaafcd345663cb65ccf38555c68183f25b6ec0e436f8f236fe8636 - cofactor/cofactor32t233 - order = 2 + cofactor/cofactor233t32 + cofactor order = 2 + + + cofactor233t32/1 + 0x00027d98a3ee381684443b18bdabf2a8e83b6e99bad701208a688115e418,0x01f167acce102a713f0256da2c6ef68d9162cb45b99bd0d3a579c6996545 + cofactor/cofactor233t32 + cofactor order = 4 + + + cofactor233t32/2 + 0x00644243499f513d3541244f49419eaeb3714b641da3fe566d2c1fd04f4e,0x00c6f0694379c25b852bb8e71785912fc3b73275061da6f0e91f50d6aa48 + cofactor/cofactor233t32 + cofactor order = 8 + + + cofactor233t32/3 + 0x01eea9c0d7203865aba9d5ef5c8688c8f028222bd8c553ea2a37549ec1af,0x0049a7cf8f926869ebc36e2ff636e5eb7cb1d0406a6e43902bb921859883 + cofactor/cofactor233t32 + cofactor order = 16 + + + cofactor233t32/4 + 0x01880fb8975f5024c34bd78dd2d5fbedb724ee288940c6a4ae50c3fe88c2,0x00118b407d962d2c4359f639258526d6c8ed8a1db93034ff34d877b31dd1 + cofactor/cofactor233t32 + cofactor order = 32 - cofactor64t233/0 + cofactor233t64/0 0x000000000000000000000000000000000000000000000000000000000000,0x01a08b13e17f2467daaf4c4f62a397f2393b19c0bfff1dd767f6c8d94860 - cofactor/cofactor64t233 - order = 2 + cofactor/cofactor233t64 + cofactor order = 2 - cofactor128t233/0 + cofactor233t64/1 + 0x0124da33fe559716da4d8fe52bb54490159f2bc3a9c8c832a4cd321db26d,0x01744c31a30ab6b516f3a96f173aef281fbd80d3f35976b50619ffc878c8 + cofactor/cofactor233t64 + cofactor order = 4 + + + cofactor233t64/2 + 0x01f956c2aef1da18bc8c21a45e6161dac74aeb8ffc63528c5ddad8d73000,0x00b82ff8a8c62906f80294833d65c8d1e6d6fd1942cd05d88db9c7a7afed + cofactor/cofactor233t64 + cofactor order = 8 + + + cofactor233t64/3 + 0x00f3c42ae0ad4315728635a4fe24ba2a51102a3c4e94bcfbad165a534820,0x005abed4d9649b656824d041650b2bc027db10fe4a7314ea73ae8add6c34 + cofactor/cofactor233t64 + cofactor order = 16 + + + cofactor233t64/4 + 0x01d94d241b3b5a14e420f845a5835555efd8b4ac7a859a6b811309a6c525,0x00c2f035151644c52617a436b6aeabb8e50ef6e12fa5b1bd1102c913c72d + cofactor/cofactor233t64 + cofactor order = 32 + + + cofactor233t64/5 + 0x00ebc7a88e760c7932108e6c925b8e8a40cf0f809f2144e772f059cef16c,0x015fe6fec0e1558cf4cc5c73d7d0a8973eb5f7be65cc537c8055e2142c45 + cofactor/cofactor233t64 + cofactor order = 64 + + + cofactor233t128/0 0x000000000000000000000000000000000000000000000000000000000000,0x0018948e6063085fbc0a661dc0d06bc45c2bbab443e9d983753886b918ea - cofactor/cofactor128t233 - order = 2 + cofactor/cofactor233t128 + cofactor order = 2 + + + cofactor233t128/1 + 0x01e41de7ac8dabaa1e873fd528d3c5e462890f60a444a12e1f87902a5f80,0x01148ae9d64a4223ba0bd24d642a6b2cdbbc1358fccd78eea473019a3aa8 + cofactor/cofactor233t128 + cofactor order = 4 + + + cofactor233t128/2 + 0x00e62c29001164bd807f1984bc2d9df15f979f42acf6d10ca6df31ebd8f8,0x00b5e5a686e3a8f87db3c03223322e3d6d0b67ac1d959e3b43a5d66cc734 + cofactor/cofactor233t128 + cofactor order = 8 + + + cofactor233t128/3 + 0x019cf3cd40ee9c3feff8d301ce3b949691d4a1415b89f6e4d2f9799c2071,0x012c90d7c0d2b2a6677cd1015e7611334098c557181080d1e3c4832b7e46 + cofactor/cofactor233t128 + cofactor order = 16 + + + cofactor233t128/4 + 0x00c9fe0dc85e72812aa285b889786c323d2c55de71cf8aa3706c4d5819e1,0x018770dd46a7914c7e8ba6f9babe7a43d489237331fa5d5be1f4a8478d93 + cofactor/cofactor233t128 + cofactor order = 32 + + + cofactor233t128/5 + 0x01a9d88c20ae689f118efc37e85699a87826c224470f2ed075d377505765,0x01d3d88eca62c36c83300658c35cf4c50fb62e4d38b890462db90a7b0892 + cofactor/cofactor233t128 + cofactor order = 64 + + + cofactor233t128/6 + 0x014ab29589292a78426bd618c99c520a950119e2642302c02e29e4507ccc,0x01ce0273b2fe1e3bdc53116d670ce682d73d0988dc124169dfadd1d1f727 + cofactor/cofactor233t128 + cofactor order = 128 &secg; @@ -182,28 +650,58 @@ composite/pq/composite128/1 cofactor order = 0x000000003c1be1d1dd7edf84b8013495 + + pq/cofactor128/2 + 0x6ef5b1d42abdbd6f44bcf4d64504927c,0x73e82c27b93032b7a7a15111d1569bb3 + composite/pq/composite128/2 + cofactor order = 0x000000000000000000000003f76917eb + pq/cofactor160/1 0x0818df9ccebf5b3fd422d00393d346b314e48f98,0x75bde540b81b5bf0ab45c86fbff7bb2e7ec833cb composite/pq/composite160/1 cofactor order = 0x00000000000000000d4d7041e1dbf10b42f48c4f + + pq/cofactor160/2 + 0x706deef87d4593bbeaa70bc2609e1d8c0e2e0c10,0x64df2537d395da2e0cb8c7e340426b64699cf325 + composite/pq/composite160/2 + cofactor order = 0x00000000000000000000000af2407f270b81f45f + pq/cofactor192/1 0x6366613b66339fa580f390d630ccf9b535437229aa8b61cd,0x1b975fa3848bd68f34f6a08b7cf190bcaeaf9782270e2413 composite/pq/composite192/1 cofactor order = 0x00000000000000000000035efd8bad55038e6bd22db8b805 + + pq/cofactor192/2 + 0x6366613b66339fa580f390d630ccf9b535437229aa8b61cd,0x2abab8c0e803a3612c7a7fbcb47e06fd8ef42a7a7d8c380f + composite/pq/composite192/2 + cofactor order = 0x00000000000000000000000000302b72431ff070e7e06799 + pq/cofactor224/1 0x97e540c8fc6f9603f25b1689895e5fe738565013675b1bd6c0e16a4b,0x66d0bbe7ee9b0e9e7e1d43b6a47e1d5550c696433c58ee06b94e8615 composite/pq/composite224/1 cofactor order = 0x0000000000000000000006a99de2a928e8f227e7a2ed33a555f24ef5 + + pq/cofactor224/2 + 0x1b189f3372946c9cbb421a60bc3a0a06d16cf3ce043781ada561834c,0x57e00f270dbc56c6c86946dcb6c6ab12133d168609c588b6960c357f + composite/pq/composite224/2 + cofactor order = 0x00000000000000000000000000000000001824ec370e405bfb5024db + pq/cofactor256/1 - 0x93d1f4d02d6f0d2ea7b80f7095e70e731bcf66fb8118e7698a16eab45aadcaa4,0x3db7c6ee2d24d142ee0ec56f3ba0a606d099debb66a765e3926a5aa19539a2c3 + 0xda63037417b6151b844b2367428f52692f31f14a6654edc58edb5864d0e85ff7,0x8191a142a1c4f913e146af089b1cbe12a803473d207e93697afd1a83818e08be composite/pq/composite256/1 cofactor order = 0x000000000000000220d23234534b240aac0efa70a3bc44e046c2431ad5a32d27 + + pq/cofactor256/2 + 0x7b258197e20de13053c3384efd34c3f17172d8ee22c4e23491ca2f867383d8de,0x4aa05d30077ed1bfa45301348e6ab9b1d436f1755c6747c958d4dc24fcb6996c + composite/pq/composite256/2 + cofactor order = 0x000000000000000000000000000000000000000000000000743bc7ea193d40db + diff --git a/src/cz/crcs/ectester/data/composite/composite256_pq1.csv b/src/cz/crcs/ectester/data/composite/composite256_pq1.csv index e3d5b42..9ac845f 100644 --- a/src/cz/crcs/ectester/data/composite/composite256_pq1.csv +++ b/src/cz/crcs/ectester/data/composite/composite256_pq1.csv @@ -1 +1 @@ -0xf75e78a6e2acb23d6317e57258287c00597e24881e0686039d0badb77b4e6b21,0x1aafadea1da31b45bbc02da735cc341f9cf9915884eb9cd31441520ead906b38,0x0f7f209988b0eada7190201ace3b3972d6ce3cbadac9933716d08645a7c31c63,0x93d1f4d02d6f0d2ea7b80f7095e70e731bcf66fb8118e7698a16eab45aadcaa4,0x51dccaa47e35062383e4878625bf2116be5413c34a1b964c7547f65297f0bc04,0x000000000000000000000000000000000000000000000000743bc7ea193d40db,0x01 \ No newline at end of file +0xf75e78a6e2acb23d6317e57258287c00597e24881e0686039d0badb77b4e6b21,0x1aafadea1da31b45bbc02da735cc341f9cf9915884eb9cd31441520ead906b38,0x0f7f209988b0eada7190201ace3b3972d6ce3cbadac9933716d08645a7c31c63,0x7b258197e20de13053c3384efd34c3f17172d8ee22c4e23491ca2f867383d8de,0x4aa05d30077ed1bfa45301348e6ab9b1d436f1755c6747c958d4dc24fcb6996c,0x000000000000000000000000000000000000000000000000743bc7ea193d40db,0x01 \ No newline at end of file diff --git a/src/cz/crcs/ectester/data/composite/composite256_pq2.csv b/src/cz/crcs/ectester/data/composite/composite256_pq2.csv index c67eaa7..b8b5e9b 100644 --- a/src/cz/crcs/ectester/data/composite/composite256_pq2.csv +++ b/src/cz/crcs/ectester/data/composite/composite256_pq2.csv @@ -1 +1 @@ -0xf75e78a6e2acb23d6317e57258287c00597e24881e0686039d0badb77b4e6b21,0x1aafadea1da31b45bbc02da735cc341f9cf9915884eb9cd31441520ead906b38,0x0f7f209988b0eada7190201ace3b3972d6ce3cbadac9933716d08645a7c31c63,0x93d1f4d02d6f0d2ea7b80f7095e70e731bcf66fb8118e7698a16eab45aadcaa4,0x3db7c6ee2d24d142ee0ec56f3ba0a606d099debb66a765e3926a5aa19539a2c3,0x000000000000000220d23234534b240aac0efa70a3bc44e046c2431ad5a32d27,0x01 \ No newline at end of file +0xf75e78a6e2acb23d6317e57258287c00597e24881e0686039d0badb77b4e6b21,0x1aafadea1da31b45bbc02da735cc341f9cf9915884eb9cd31441520ead906b38,0x0f7f209988b0eada7190201ace3b3972d6ce3cbadac9933716d08645a7c31c63,0xda63037417b6151b844b2367428f52692f31f14a6654edc58edb5864d0e85ff7,0x8191a142a1c4f913e146af089b1cbe12a803473d207e93697afd1a83818e08be,0x000000000000000220d23234534b240aac0efa70a3bc44e046c2431ad5a32d27,0x01 \ No newline at end of file diff --git a/src/cz/crcs/ectester/reader/ECTesterReader.java b/src/cz/crcs/ectester/reader/ECTesterReader.java index f81b95a..7dc11fa 100644 --- a/src/cz/crcs/ectester/reader/ECTesterReader.java +++ b/src/cz/crcs/ectester/reader/ECTesterReader.java @@ -26,6 +26,7 @@ import cz.crcs.ectester.applet.ECTesterApplet; import cz.crcs.ectester.applet.EC_Consts; import cz.crcs.ectester.common.cli.CLITools; import cz.crcs.ectester.common.cli.Colors; +import cz.crcs.ectester.common.ec.EC_Curve; import cz.crcs.ectester.common.ec.EC_Params; import cz.crcs.ectester.common.output.OutputLogger; import cz.crcs.ectester.common.output.TestWriter; diff --git a/src/cz/crcs/ectester/reader/test/CardCofactorSuite.java b/src/cz/crcs/ectester/reader/test/CardCofactorSuite.java index 3ad2798..2ecf4a2 100644 --- a/src/cz/crcs/ectester/reader/test/CardCofactorSuite.java +++ b/src/cz/crcs/ectester/reader/test/CardCofactorSuite.java @@ -39,14 +39,14 @@ public class CardCofactorSuite extends CardTestSuite { Test set = CommandTest.expect(new Command.Set(this.card, ECTesterApplet.KEYPAIR_BOTH, EC_Consts.CURVE_external, curve.getParams(), curve.flatten()), ExpectedValue.SUCCESS); Test generate = CommandTest.expect(new Command.Generate(this.card, ECTesterApplet.KEYPAIR_LOCAL), ExpectedValue.SUCCESS); - Test prepare = CompoundTest.all(ExpectedValue.SUCCESS, "Prepare and generate keypair on " + curve.getId(), allocate, set, generate); + Test prepare = CompoundTest.all(ExpectedValue.SUCCESS, "Prepare and generate keypair on " + curve.getId() + ".", allocate, set, generate); List ecdhTests = new LinkedList<>(); for (EC_Key.Public pub : keys) { 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()); ecdhTests.add(CommandTest.expect(ecdhCommand, ExpectedValue.FAILURE, "Card correctly rejected point on non-generator subgroup.", "Card incorrectly accepted point on non-generator subgroup.")); } - Test ecdh = CompoundTest.all(ExpectedValue.SUCCESS, "Perform ECDH with public points on non-generator subgroup", ecdhTests.toArray(new Test[0])); + Test ecdh = CompoundTest.all(ExpectedValue.SUCCESS, "Perform ECDH with public points on non-generator subgroup.", ecdhTests.toArray(new Test[0])); Random r = new Random(); byte[] raw = new byte[128]; @@ -60,13 +60,13 @@ public class CardCofactorSuite extends CardTestSuite { Test setTest = CommandTest.expect(setCommand, ExpectedValue.ANY); Command ecdsaCommand = new Command.ECDSA_verify(this.card, ECTesterApplet.KEYPAIR_REMOTE, EC_Consts.Signature_ALG_ECDSA_SHA, raw, sig); Test ecdsaTest = CommandTest.expect(ecdsaCommand, ExpectedValue.FAILURE); - ecdsaTests.add(CompoundTest.all(ExpectedValue.SUCCESS, "Verify random ECDSA signature by " + pub.getId(), setTest, ecdsaTest)); + ecdsaTests.add(CompoundTest.all(ExpectedValue.SUCCESS, "Verify random ECDSA signature by " + pub.getId() + ".", setTest, ecdsaTest)); } Test ecdsa = CompoundTest.all(ExpectedValue.SUCCESS, "Verify random ECDSA signature by public points on non-generator subgroup.", ecdsaTests.toArray(new Test[0])); Test tests = CompoundTest.all(ExpectedValue.SUCCESS, "Perform ECDH and ECDSA tests.", ecdh, ecdsa); - doTest(CompoundTest.greedyAllTry(ExpectedValue.SUCCESS, "Cofactor test of " + curve.getId(), prepare, tests)); + doTest(CompoundTest.greedyAllTry(ExpectedValue.SUCCESS, "Cofactor test of " + curve.getId() + ".", prepare, tests)); new Command.Cleanup(this.card).send(); } } -- cgit v1.2.3-70-g09d2