15 files changed, 175 insertions, 0 deletions

diff --git a/src/cz/crcs/ectester/data/cofactor/cofactor128t233.csv b/src/cz/crcs/ectester/data/cofactor/cofactor128t233.csv
new file mode 100644
index 0000000..48505d4
--- /dev/null
+++ b/src/cz/crcs/ectester/data/cofactor/cofactor128t233.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/cofactor16p160.csv b/src/cz/crcs/ectester/data/cofactor/cofactor16p160.csv
new file mode 100644
index 0000000..4d82274
--- /dev/null
+++ b/src/cz/crcs/ectester/data/cofactor/cofactor16p160.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/cofactor16t233.csv b/src/cz/crcs/ectester/data/cofactor/cofactor16t233.csv
new file mode 100644
index 0000000..d838407
--- /dev/null
+++ b/src/cz/crcs/ectester/data/cofactor/cofactor16t233.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/cofactor2p160.csv b/src/cz/crcs/ectester/data/cofactor/cofactor2p160.csv
new file mode 100644
index 0000000..54717af
--- /dev/null
+++ b/src/cz/crcs/ectester/data/cofactor/cofactor2p160.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/cofactor2t233.csv b/src/cz/crcs/ectester/data/cofactor/cofactor2t233.csv
new file mode 100644
index 0000000..61a945f
--- /dev/null
+++ b/src/cz/crcs/ectester/data/cofactor/cofactor2t233.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/cofactor32p160.csv b/src/cz/crcs/ectester/data/cofactor/cofactor32p160.csv
new file mode 100644
index 0000000..75238ea
--- /dev/null
+++ b/src/cz/crcs/ectester/data/cofactor/cofactor32p160.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/cofactor32t233.csv b/src/cz/crcs/ectester/data/cofactor/cofactor32t233.csv
new file mode 100644
index 0000000..4f14dfe
--- /dev/null
+++ b/src/cz/crcs/ectester/data/cofactor/cofactor32t233.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/cofactor4p160.csv b/src/cz/crcs/ectester/data/cofactor/cofactor4p160.csv
new file mode 100644
index 0000000..760dbef
--- /dev/null
+++ b/src/cz/crcs/ectester/data/cofactor/cofactor4p160.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/cofactor4t233.csv b/src/cz/crcs/ectester/data/cofactor/cofactor4t233.csv
new file mode 100644
index 0000000..1972de2
--- /dev/null
+++ b/src/cz/crcs/ectester/data/cofactor/cofactor4t233.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/cofactor64p160.csv b/src/cz/crcs/ectester/data/cofactor/cofactor64p160.csv
new file mode 100644
index 0000000..4cdcfdc
--- /dev/null
+++ b/src/cz/crcs/ectester/data/cofactor/cofactor64p160.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/cofactor64t233.csv b/src/cz/crcs/ectester/data/cofactor/cofactor64t233.csv
new file mode 100644
index 0000000..df9e357
--- /dev/null
+++ b/src/cz/crcs/ectester/data/cofactor/cofactor64t233.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/cofactor8p160.csv b/src/cz/crcs/ectester/data/cofactor/cofactor8p160.csv
new file mode 100644
index 0000000..60ca98e
--- /dev/null
+++ b/src/cz/crcs/ectester/data/cofactor/cofactor8p160.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/cofactor8t233.csv b/src/cz/crcs/ectester/data/cofactor/cofactor8t233.csv
new file mode 100644
index 0000000..43f6705
--- /dev/null
+++ b/src/cz/crcs/ectester/data/cofactor/cofactor8t233.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/curves.xml b/src/cz/crcs/ectester/data/cofactor/curves.xml
index 0bf769f..559d10b 100644
--- a/src/cz/crcs/ectester/data/cofactor/curves.xml
+++ b/src/cz/crcs/ectester/data/cofactor/curves.xml
@@ -44,6 +44,44 @@
         <field>prime</field>
         <file>cofactor128p128.csv</file>
     </curve>
+
+    <curve>
+        <id>cofactor2p160</id>
+        <bits>160</bits>
+        <field>prime</field>
+        <file>cofactor2p160.csv</file>
+    </curve>
+    <curve>
+        <id>cofactor4p160</id>
+        <bits>160</bits>
+        <field>prime</field>
+        <file>cofactor4p160.csv</file>
+    </curve>
+    <curve>
+        <id>cofactor8p160</id>
+        <bits>160</bits>
+        <field>prime</field>
+        <file>cofactor8p160.csv</file>
+    </curve>
+    <curve>
+        <id>cofactor16p160</id>
+        <bits>160</bits>
+        <field>prime</field>
+        <file>cofactor16p160.csv</file>
+    </curve>
+    <curve>
+        <id>cofactor32p160</id>
+        <bits>160</bits>
+        <field>prime</field>
+        <file>cofactor32p160.csv</file>
+    </curve>
+    <curve>
+        <id>cofactor64p160</id>
+        <bits>160</bits>
+        <field>prime</field>
+        <file>cofactor64p160.csv</file>
+    </curve>
+    
     
     <curve>
         <id>cofactor2t163</id>
@@ -87,4 +125,47 @@
         <field>binary</field>
         <file>cofactor128t163.csv</file>
     </curve>
+
+    <curve>
+        <id>cofactor2t233</id>
+        <bits>233</bits>
+        <field>binary</field>
+        <file>cofactor2t233.csv</file>
+    </curve>
+    <curve>
+        <id>cofactor4t233</id>
+        <bits>233</bits>
+        <field>binary</field>
+        <file>cofactor4t233.csv</file>
+    </curve>
+    <curve>
+        <id>cofactor8t233</id>
+        <bits>233</bits>
+        <field>binary</field>
+        <file>cofactor8t233.csv</file>
+    </curve>
+    <curve>
+        <id>cofactor16t233</id>
+        <bits>233</bits>
+        <field>binary</field>
+        <file>cofactor16t233.csv</file>
+    </curve>
+    <curve>
+        <id>cofactor32t233</id>
+        <bits>233</bits>
+        <field>binary</field>
+        <file>cofactor32t233.csv</file>
+    </curve>
+    <curve>
+        <id>cofactor64t233</id>
+        <bits>233</bits>
+        <field>binary</field>
+        <file>cofactor64t233.csv</file>
+    </curve>
+    <curve>
+        <id>cofactor128t233</id>
+        <bits>233</bits>
+        <field>binary</field>
+        <file>cofactor128t233.csv</file>
+    </curve>
 </curves>
diff --git a/src/cz/crcs/ectester/data/cofactor/keys.xml b/src/cz/crcs/ectester/data/cofactor/keys.xml
index f65080a..17ce416 100644
--- a/src/cz/crcs/ectester/data/cofactor/keys.xml
+++ b/src/cz/crcs/ectester/data/cofactor/keys.xml
@@ -51,6 +51,44 @@
     </pubkey>
 
     <pubkey>
+        <id>cofactor2p160/0</id>
+        <inline>0x5fa441bf614740860b6eb17c525fadf7fda8a8dd,0x0000000000000000000000000000000000000000</inline>
+        <curve>cofactor/cofactor2p160</curve>
+        <desc>order = 2</desc>
+    </pubkey>
+    <pubkey>
+        <id>cofactor4p160/0</id>
+        <inline>0x023deee1d84150a62b98aa5bfc199af554653515,0x0000000000000000000000000000000000000000</inline>
+        <curve>cofactor/cofactor4p160</curve>
+        <desc>order = 2</desc>
+    </pubkey>
+    <pubkey>
+        <id>cofactor8p160/0</id>
+        <inline>0x05e55a12fb3fc534266721e50921b87175ba6058,0x0000000000000000000000000000000000000000</inline>
+        <curve>cofactor/cofactor8p160</curve>
+        <desc>order = 2</desc>
+    </pubkey>
+    <pubkey>
+        <id>cofactor16p160/0</id>
+        <inline>0x1e20529f2293f0a08cc722d7fa8e56ddd4eb3b8a,0x0000000000000000000000000000000000000000</inline>
+        <curve>cofactor/cofactor16p160</curve>
+        <desc>order = 2</desc>
+    </pubkey>
+    <pubkey>
+        <id>cofactor32p160/0</id>
+        <inline>0x8cff23fa9830f93cb2d46aa5f91e6f53080fa5b7,0x0000000000000000000000000000000000000000</inline>
+        <curve>cofactor/cofactor32p160</curve>
+        <desc>order = 2</desc>
+    </pubkey>
+    <pubkey>
+        <id>cofactor64p160/0</id>
+        <inline>0x46b72d87edddeea2fa3ef32725fcf8c1e19bf40d,0x0000000000000000000000000000000000000000</inline>
+        <curve>cofactor/cofactor64p160</curve>
+        <desc>order = 2</desc>
+    </pubkey>
+
+
+    <pubkey>
         <id>cofactor2t163/0</id>
         <inline>0x000000000000000000000000000000000000000000,0x0132720c6aa3f2ca65d18f2de81e5e6b8ad4a3ef9d</inline>
         <curve>cofactor/cofactor2t163</curve>
@@ -93,5 +131,48 @@
         <desc>order = 2</desc>
     </pubkey>
 
+    <pubkey>
+        <id>cofactor2t233/0</id>
+        <inline>0x000000000000000000000000000000000000000000000000000000000000,0x00a5237785bb2d49881f043553257d8600988d9603b43b4c2d74539a7ab3</inline>
+        <curve>cofactor/cofactor2t233</curve>
+        <desc>order = 2</desc>
+    </pubkey>
+    <pubkey>
+        <id>cofactor4t233/0</id>
+        <inline>0x000000000000000000000000000000000000000000000000000000000000,0x01e70983b7039468a1b58b757d8343c7612f847f51f357ccca6a4c38e774</inline>
+        <curve>cofactor/cofactor4t233</curve>
+        <desc>order = 2</desc>
+    </pubkey>
+    <pubkey>
+        <id>cofactor8t233/0</id>
+        <inline>0x000000000000000000000000000000000000000000000000000000000000,0x0087c295986f53382f7f1d4c8f268bdde12c5e2b641e53f84b5c2feb209a</inline>
+        <curve>cofactor/cofactor8t233</curve>
+        <desc>order = 2</desc>
+    </pubkey>
+    <pubkey>
+        <id>cofactor16t233/0</id>
+        <inline>0x000000000000000000000000000000000000000000000000000000000000,0x00c6ff713492ad9d63db4627a4f8d0d67388d85ea20ba5ef234a43ec98d4</inline>
+        <curve>cofactor/cofactor16t233</curve>
+        <desc>order = 2</desc>
+    </pubkey>
+    <pubkey>
+        <id>cofactor32t233/0</id>
+        <inline>0x000000000000000000000000000000000000000000000000000000000000,0x00e85ccaafcd345663cb65ccf38555c68183f25b6ec0e436f8f236fe8636</inline>
+        <curve>cofactor/cofactor32t233</curve>
+        <desc>order = 2</desc>
+    </pubkey>
+    <pubkey>
+        <id>cofactor64t233/0</id>
+        <inline>0x000000000000000000000000000000000000000000000000000000000000,0x01a08b13e17f2467daaf4c4f62a397f2393b19c0bfff1dd767f6c8d94860</inline>
+        <curve>cofactor/cofactor64t233</curve>
+        <desc>order = 2</desc>
+    </pubkey>
+    <pubkey>
+        <id>cofactor128t233/0</id>
+        <inline>0x000000000000000000000000000000000000000000000000000000000000,0x0018948e6063085fbc0a661dc0d06bc45c2bbab443e9d983753886b918ea</inline>
+        <curve>cofactor/cofactor128t233</curve>
+        <desc>order = 2</desc>
+    </pubkey>
+
     &secg;
 </keys>