Merge branch 'devel'

8 files changed, 55 insertions, 0 deletions

diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor128p56467.csv b/src/cz/crcs/ectester/data/cofactor/cofactor128p56467.csv
new file mode 100644
index 0000000..193f6a7
--- /dev/null
+++ b/src/cz/crcs/ectester/data/cofactor/cofactor128p56467.csv
@@ -0,0 +1 @@
+0xe8e100a50b479105f40c312de4bc7127,0x854c8cdc7389dbb3da8a949ce4598ebe,0x4e592cbd1471bba6dec1106cfa99f969,0x7a6c7f7f8305853831d7c99dd23b03aa,0xa3ad04379cb4789bd64e7d99a7874e0b,0x00010e47ea4c399c7ddb49c9915c3b5d,0xdc93
\ No newline at end of file
diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor128p65521.csv b/src/cz/crcs/ectester/data/cofactor/cofactor128p65521.csv
new file mode 100644
index 0000000..80a1eb3
--- /dev/null
+++ b/src/cz/crcs/ectester/data/cofactor/cofactor128p65521.csv
@@ -0,0 +1 @@
+0xdc068a34e30288e08b495798af63ebc7,0xdc068a34e3027b1ccb5209bee1c3ebc7,0xdc054fb5cb170758f9fe7d1b5f63ebc7,0xc0d6edec3ac87edf8499d1885fd03e7b,0x81cb302f36ecd3ff93cd6314ce059e14,0x0000dc136f586930b2b948e64bb6e653,0xfff1
\ No newline at end of file
diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor128p65535.csv b/src/cz/crcs/ectester/data/cofactor/cofactor128p65535.csv
new file mode 100644
index 0000000..54da6cc
--- /dev/null
+++ b/src/cz/crcs/ectester/data/cofactor/cofactor128p65535.csv
@@ -0,0 +1 @@
+0xdd94e89ef3fba74afc2a67cb91546a93,0x6cf4828ab4960df2b9fcab3990e3959a,0x80a5c32206c83f769c5ed3e4f5b2ea4e,0xd7a4bb4b7e9ad9e81895caeaeac8b739,0x45ebc51cf353974b02b36b9912de041b,0x0000dd95c634ba30617af48fd4eb321b,0xffff
\ No newline at end of file
diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor192p2.csv b/src/cz/crcs/ectester/data/cofactor/cofactor192p2.csv
new file mode 100644
index 0000000..4de7049
--- /dev/null
+++ b/src/cz/crcs/ectester/data/cofactor/cofactor192p2.csv
@@ -0,0 +1 @@
+0x79cb22319472d019a08f7ae4f99c3edea2f167773210eab7,0x2b1afa29b6e9f7e148f7eb306ae942a506546c7129d56a3f,0x704d348ecd838ed800911bab3298aeebbf1c03b5489bca5d,0x61fc509a9d967735e8f18b0a4ba323134989c7711f44c35b,0x4fe31f28e2ee2a41f6fd661e417d32832bee6f3e164b167e,0x3ce59118ca39680cd047bd72595564c3953a773f01833de3,0x02
\ No newline at end of file
diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor192p4.csv b/src/cz/crcs/ectester/data/cofactor/cofactor192p4.csv
new file mode 100644
index 0000000..645f031
--- /dev/null
+++ b/src/cz/crcs/ectester/data/cofactor/cofactor192p4.csv
@@ -0,0 +1 @@
+0x8cceb84c81521937bef0925a3aaf09195a59c3f99ae06135,0x6ad5a0b617af4ac05f668ae0236f0a485290c36ef609efb5,0x3289c9a3f4f0364147634d40c2f7604e4bc98773daefc954,0x314789e7e4e448b000d235cc51251e70cd8c92c11d1858f9,0x74459b81d5322dc2c631d3ba964e8b4c8f1e4196939a5579,0x2333ae132054864defbc24965da70e7dbdb87ba264315991,0x04
\ No newline at end of file
diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor192p8.csv b/src/cz/crcs/ectester/data/cofactor/cofactor192p8.csv
new file mode 100644
index 0000000..ee39445
--- /dev/null
+++ b/src/cz/crcs/ectester/data/cofactor/cofactor192p8.csv
@@ -0,0 +1 @@
+0xa9a93bb887865d349841624bd8281c589a8e0196ae724eed,0x1b8b108f729cc205fb0ec88825d7d696e3df62ed328bd535,0x81078fdf85b1ee56ea3e27f6dedcca6f5eb9b645f536dc68,0x37369946896227fce5bfe8f760ba827080caa6700d8d8aaa,0x7f54e11bf72549866571fb70b383b6d1451973c11e3fd082,0x1535277710f0cba693082c4985a9197e9e759aa3571eb787,0x08
\ 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 7cf2a9a..0b8c52e 100644
--- a/src/cz/crcs/ectester/data/cofactor/curves.xml
+++ b/src/cz/crcs/ectester/data/cofactor/curves.xml
@@ -44,6 +44,24 @@
         <field>prime</field>
         <file>cofactor128p128.csv</file>
     </curve>
+    <curve>
+        <id>large/cofactor128p56467</id>
+        <bits>128</bits>
+        <field>prime</field>
+        <file>cofactor128p56467.csv</file>
+    </curve>
+    <curve>
+        <id>large/cofactor128p65521</id>
+        <bits>128</bits>
+        <field>prime</field>
+        <file>cofactor128p65521.csv</file>
+    </curve>
+    <curve>
+        <id>large/cofactor128p65535</id>
+        <bits>128</bits>
+        <field>prime</field>
+        <file>cofactor128p65535.csv</file>
+    </curve>
 
     <curve>
         <id>cofactor160p2</id>
@@ -88,6 +106,18 @@
         <field>prime</field>
         <file>cofactor192p2.csv</file>
     </curve>
+    <curve>
+        <id>cofactor192p4</id>
+        <bits>192</bits>
+        <field>prime</field>
+        <file>cofactor192p4.csv</file>
+    </curve>
+    <curve>
+        <id>cofactor192p8</id>
+        <bits>192</bits>
+        <field>prime</field>
+        <file>cofactor192p8.csv</file>
+    </curve>
     
     <curve>
         <id>cofactor163t2</id>
diff --git a/src/cz/crcs/ectester/data/cofactor/keys.xml b/src/cz/crcs/ectester/data/cofactor/keys.xml
index b4c0c90..2be7238 100644
--- a/src/cz/crcs/ectester/data/cofactor/keys.xml
+++ b/src/cz/crcs/ectester/data/cofactor/keys.xml
@@ -702,4 +702,23 @@
         <curve>composite/pq/composite256/2</curve>
         <desc>cofactor order = 0x000000000000000000000000000000000000000000000000743bc7ea193d40db</desc>
     </pubkey>
+
+    <pubkey>
+        <id>large/cofactor128p56467/0</id>
+        <inline>0x8afd6cc280e0be7163bb6f285a7c6391,0xae64e0f1afc7bd5c75e2f36a7d85f668</inline>
+        <curve>cofactor/large/cofactor128p56467</curve>
+        <desc>cofactor order = 0xdc93</desc>
+    </pubkey>
+    <pubkey>
+        <id>large/cofactor128p65521/0</id>
+        <inline>0x70e43816ed51388caa54a68b6c500352,0xab05b43e2cde6086b12350abe79b9175</inline>
+        <curve>cofactor/large/cofactor128p65521</curve>
+        <desc>cofactor order = 0xfff1</desc>
+    </pubkey>
+    <pubkey>
+        <id>large/cofactor128p65535/0</id>
+        <inline>0x39d6ea56c3eb6382d2d7a9d327a191fd,0x3ebb3f4626d05df38572af3ae5fa60f2</inline>
+        <curve>cofactor/large/cofactor128p65535</curve>
+        <desc>cofactor order = 0xffff</desc>
+    </pubkey>
 </keys>