Add some more Montgomery curves transformed into short Weierstrass.

6 files changed, 43 insertions, 1 deletions

diff --git a/src/cz/crcs/ectester/data/categories.xml b/src/cz/crcs/ectester/data/categories.xml
index 8b8ffc2..b51011a 100644
--- a/src/cz/crcs/ectester/data/categories.xml
+++ b/src/cz/crcs/ectester/data/categories.xml
@@ -40,7 +40,12 @@
     <category>
         <name>Barreto-Naehrig</name>
         <directory>bn</directory>
-        <desc>Barreto-Naehrig curves from: https://eprint.iacr.org/2010/429.pdf</desc>
+        <desc>Barreto-Naehrig curves from: A Family of Implementation-Friendly BN Elliptic Curves - https://eprint.iacr.org/2010/429.pdf.</desc>
+    </category>
+    <category>
+        <name>other</name>
+        <directory>other</directory>
+        <desc>An assortment of some other curves.</desc>
     </category>
 
     <!-- Custom curves -->
diff --git a/src/cz/crcs/ectester/data/other/curve25519.csv b/src/cz/crcs/ectester/data/other/curve25519.csv
new file mode 100644
index 0000000..2e62d80
--- /dev/null
+++ b/src/cz/crcs/ectester/data/other/curve25519.csv
@@ -0,0 +1 @@
+0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFED,0x2AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA984914A144,0x7B425ED097B425ED097B425ED097B425ED097B425ED097B4260B5E9C7710C864,0x2AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD245A,0x20AE19A1B8A086B4E01EDD2C7748D14C923D4D7E6D7C61B229E9C5A27ECED3D9,0x1000000000000000000000000000000014DEF9DEA2F79CD65812631A5CF5D3ED,0x02
\ No newline at end of file
diff --git a/src/cz/crcs/ectester/data/other/curves.xml b/src/cz/crcs/ectester/data/other/curves.xml
new file mode 100644
index 0000000..f200d9c
--- /dev/null
+++ b/src/cz/crcs/ectester/data/other/curves.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<curves xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../schema.xsd">
+    <curve>
+        <id>M-221</id>
+        <bits>221</bits>
+        <field>prime</field>
+        <file>m221.csv</file>
+        <desc>Montgomery M-221 curve from eprint 2013/647, transformed into short Weierstrass form</desc>
+    </curve>
+    <curve>
+        <id>M-383</id>
+        <bits>383</bits>
+        <field>prime</field>
+        <file>m383.csv</file>
+        <desc>Montgomery M-383 curve from eprint 2013/647, transformed into short Weierstrass form</desc>
+    </curve>
+    <curve>
+        <id>M-511</id>
+        <bits>511</bits>
+        <field>prime</field>
+        <file>m511.csv</file>
+        <desc>Montgomery M-511 curve from eprint 2013/647, transformed into short Weierstrass form</desc>
+    </curve>
+
+    <curve>
+        <id>Curve25519</id>
+        <bits>256</bits>
+        <field>prime</field>
+        <file>curve25519.csv</file>
+        <desc>Curve25519 transformed into short Weierstrass form</desc>
+    </curve>
+</curves>
\ No newline at end of file
diff --git a/src/cz/crcs/ectester/data/other/m221.csv b/src/cz/crcs/ectester/data/other/m221.csv
new file mode 100644
index 0000000..0a74263
--- /dev/null
+++ b/src/cz/crcs/ectester/data/other/m221.csv
@@ -0,0 +1 @@
+0x1FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD,0x155555555555555555555555555555555555555555555554451FF4F3,0x1684BDA12F684BDA12F684BDA12F684BDA12F684BDA19B7249700DF7,0x1555555555555555555555555555555555555555555555555555EDC0,0x0F7ACDD2A4939571D1CEF14ECA37C228E61DBFF10707DC6C08C5056D,0x040000000000000000000000000015A08ED730E8A2F77F005042605B,0x4
diff --git a/src/cz/crcs/ectester/data/other/m383.csv b/src/cz/crcs/ectester/data/other/m383.csv
new file mode 100644
index 0000000..9a8890d
--- /dev/null
+++ b/src/cz/crcs/ectester/data/other/m383.csv
@@ -0,0 +1 @@
+0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF45,0x2AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA95FABD1AE6C,0x04BDA12F684BDA12F684BDA12F684BDA12F684BDA12F684BDA12F684BDA12F684BDA12F684BDA12F7159AE18A4923F45,0x5555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555FD5E4,0x1EC7ED04AAF834AF310E304B2DA0F328E7C165F0E8988ABD3992861290F617AA1F1B2E7D0B6E332E969991B62555E77E,0x10000000000000000000000000000000000000000000000006C79673AC36BA6E7A32576F7B1B249E46BBC225BE9071D7,0x02
diff --git a/src/cz/crcs/ectester/data/other/m511.csv b/src/cz/crcs/ectester/data/other/m511.csv
new file mode 100644
index 0000000..815714c
--- /dev/null
+++ b/src/cz/crcs/ectester/data/other/m511.csv
@@ -0,0 +1 @@
+0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF45,0x2AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA94D474F50C,0x425ED097B425ED097B425ED097B425ED097B425ED097B425ED097B425ED097B425ED097B425ED097B425ED097B425ED097B425ED097B425ED0BEFAE0163491C0,0x2AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD5D1E,0x2FBDC0AD8530803D28FDBAD354BB488D32399AC1CF8F6E01EE3F96389B90C809422B9429E8A43DBF49308AC4455940ABE9F1DBCA542093A895E30A64AF056FA5,0x100000000000000000000000000000000000000000000000000000000000000017B5FEFF30C7F5677AB2AEEBD13779A2AC125042A6AA10BFA54C15BAB76BAF1B,0x02